Merge branch 'master' of github.com:johntrandall/photo_hackathon
Merge branch 'master' of github.com:johntrandall/photo_hackathon