Nieuwe merge

Conflicts:
	wakkerdam/templates/show_game.html