solving conflicts
Merge branch 'gh-pages' of https://github.com/CartoDB/odyssey.js into gh-pages
Merge branch 'gh-pages' of https://github.com/CartoDB/odyssey.js into gh-pages
Merge branch 'gh-pages' of https://github.com/CartoDB/odyssey.js into gh-pages
Merge branch 'gh-pages' of https://github.com/CartoDB/odyssey.js into gh-pages
add styles editor and scroll template