CSS-update
Merge branch 'master' of https://github.com/DeLaChance/ultimatum_game

Conflicts:
	game/templates/game/questionnaire.html