change relation attribute (1-1) of game and player to keep in game instead of player
fff
pull all
Merge branch 'master' of https://github.com/SJakobsen/DIM3-Team-M

Conflicts:
	go_fish_project/go_fish_project/__init__.pyc
	go_fish_project/go_fish_project/settings.pyc
	go_fish_project/go_fish_project/urls.pyc
	go_fish_project/go_fish_project/wsgi.pyc
	go_fish_project/gofish/__init__.pyc
	go_fish_project/gofish/models.pyc
	go_fish_project/gofish/urls.pyc
	go_fish_project/gofish/views.pyc