Update Meghan's local repository msater with bin/resource files
Updated serialize() in Game.java to most current attributes
Fixed method name (jsonMembers) for seialize() in Player.java
Merge branch 'mauricio'
Merge branch 'mauricio'
Merge branch 'master' of https://github.com/nwcaldwell/chokinghazard
Merge branch 'master' into mauricio