Messing around with a login button
Merge branch 'master' of https://github.com/danallan/octal-application

Conflicts:
	app_server/static/css/quiz.css
Override the kmap fix for adding linearity
Merge branch 'master' of https://github.com/danallan/octal-application