Merge pull request #9 from lucashaley/master

weekly update
Added variety of rooms
tiles now move with rooms

-also some other minor fixes
minor fixes and commenting the code for clarity
Merge pull request #12 from nichmack/master

room transitioning updated