first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/app.js
	js/controller/quiz_controller.js
	js/router/quiz_router.js