Resolves a few style conflicts between master/ghpage branches

master.css contained some conflicts that prevented game from rendering