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

Neal