style stuff for quiz mode
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3

Conflicts:
	public/javascript/main.coffee
	public/javascript/main.js
quiz box on side now
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3

Conflicts:
	public/javascript/main.js
	public/stylesheets/main.css