Merge branch 'gh-pages'
Merged branch to gh-pages
Fix main.js to load images from Instagram.
Merge branch 'master' into gh-pages