Merge branch 'master' of heroku.com:jameshider
Merge branch 'master' of github.com:Rebecca50/Hider
Andrea's blog implementation changes pulled