games no longer has conflict
some error styling
start.sh:
I REALLY hope I'm not overwriting anything

Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/custom.css.scss