new branch (?)
Merge remote-tracking branch 'origin/define-protocols' into change-model

Conflicts:
	protocols/server.proto
new branch (?)
new branch (?)
new branch (?)
new branch (?)
new branch (?)
Fix errors in code
Add GameResponse protocol