Merge pull request #18 from nealcpeters/image_migration

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