annoying
Merge branch 'master' of https://github.com/justincoh/quiz-appV2

Conflicts:
	app/index.html
	app/scripts/controllers/quiz-controller.js
CREEPY BUTTON