Merge pull request #15 from nealcpeters/image_migration

added vote scores to views
styling
Merge branch 'master' into neal
Merge pull request #16 from nealcpeters/neal

Neal
working on voting for images
Merge branch 'master' into neal
Merge pull request #17 from nealcpeters/neal

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