fixed some styling
Merge branch 'master' of https://github.com/anselon/EECS394

Conflicts:
	scripts/main.js