tims changes
IM TIRED MERGEEEE
Minor changes.
Merge branch 'master' of https://github.com/NGonGames/GGJ2013 into rooms