Merge pull request #1 from bighazycrab/master

initial rooms scaffolding. Test videos included