Merge pull request #23 from lucashaley/master

get the updates
organize room files and add other rooms
Merge pull request #1 from nichmack/master

 get Nich's code with gameCore fixes