Added the files to commit for the previous commit.
Merge branch 'master' of https://github.com/vera24m/ultimatum_game

Conflicts:
	game/views.py