First of all if your Ubuntu doesn't boot hold shift while booting, you'll see a kernel selection menu. Select rescure mode and then select safe Xorg. After that run aticonfig as foxmulder suggested. No need to delete xorg.conf though, it should be replaced by aticonfig.