Add scaffolding
Merge branch 'master' of https://github.com/christabella/ballin-octo-happiness