changes
change the updates
Merge pull request #23 from lucashaley/master

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

get new stuff
get rid of old unused code
more cleaning
Merge pull request #24 from nichmack/master

clean out unused code