Converted variables to camel case
Merge branch 'master' into will/room
Merge pull request #5 from calblueprint/will/room

Will/room