Merge pull request #5 from nealcpeters/image_migration

Image migration
controllers
validations
Merge branch 'master' into neal
Merge pull request #6 from nealcpeters/neal

Neal
home route
Merge branch 'master' into neal
Merge pull request #7 from nealcpeters/neal

Neal
deleted unnecessary migration
Merge branch 'master' into neal
Merge pull request #8 from nealcpeters/neal

Neal
Merge branch 'master' of https://github.com/nealcpeters/happiness into image_migration