Server fixes and client
Merge branch 'master' of github.com:leonz132/pennapps

Conflicts:
	client/app/src/main/res/layout/game_layout