Commit so I can switch branches
Fix merge conflicts
Remove debug print statements
Merge branch 'jordan' into touchup_ajax
Getting Jordan's updated game functionality for the ajax frontend in the game room.