valider
Merge branch 'master' of github.com:josealbea/quizz

Conflicts:
	skin/css/style.css
iMerge branch 'master' of github.com:josealbea/quizz

Conflicts:
	skin/css/style.css