Merge pull request #1 from lucashaley/master

Update
Merge pull request #2 from lucashaley/master

new pull
fixed up the room class file

-also starting to implement into the game loop
Merge pull request #2 from nichmack/master

fixing the room class