Fixed Git merge crap
Deleted some unneeded CSS crap