style css v0.04
merge
Merge branch 'master' of https://github.com/henjak/quizapp

Conflicts:
	css/style.css