Testing git again
Merge branch 'master' of https://github.com/z0isch/PhoneGame

Conflicts:
	PhoneGameWebApi/Controllers/GamesController.cs