Had the same problem after trying to setup the nvidia drivers. Try renaming the /etc/X11/xorg.conf file to something else and reboot.