Changes
Merge branch 'feature/lobby-join-game' of github.com:GameDigitizers/mustached-octo-widget into feature/lobby-join-game
Changes
Merge branch 'feature/lobby-join-game' of github.com:GameDigitizers/mustached-octo-widget into feature/lobby-join-game

Conflicts:
	server/api/player/player.model.js
	server/routes.js
Local files
Remove 'origs
Merge branch 'feature/lobby-join-game' of github.com:GameDigitizers/mustached-octo-widget into feature/lobby-join-game
Start games