facebook stuff
conflict resolved: default.js, default.html
Merge branch 'master' of https://github.com/Gr8Gatsby/flipflap