Merge pull request #26 from Rise-Vision/gh-pages

added elegance to rotation
Merge branch 'gh-pages'
added test file

Ryan took out iframe to increase performance

added hotel

added hotel template from simon
Merge pull request #28 from Rise-Vision/staging_adding-template

added test file
Merge pull request #29 from Rise-Vision/master

merge master into gh-pages