small text change
Merge pull request #1 from henriquesa/master

Added multi-room support, changed layout
Merge branch 'master' into gh-pages
update README
Merge pull request #2 from henriquesa/master

Changed layout, added AngularJS, refactored some code
Merge pull request #3 from henriquesa/gh-pages

Changed layout, added AngularJS, refactored some code
Merge pull request #4 from henriquesa/master

Added timeout feature, closed all scopes, fixed canvas
Merge pull request #5 from henriquesa/gh-pages

Added timeout feature, closed all scopes, fixed canvas
Merge pull request #6 from henriquesa/gh-pages

Fixed typo in the view
Merging repos