fixing more merge issues
Merge branch 'master' of https://github.com/johntrandall/photo_hackathon