Merge branch 'margo73465-master'
Merge branch 'master' of https://github.com/lmontopo/Chapeau

Separated app code from framework code.

s
Reorganized directories and started buzz-feed app.  Buzz-feed app still in the workings.