commit to pull
Merge branch 'master' of https://github.com/keeeeenw/AssassinServerAPI

Conflicts:
	application/views.py
working on games_for_user api
Merge branch 'master' of https://github.com/keeeeenw/AssassinServerAPI