final commit of the night
Merge branch 'master' of github.com:johntrandall/photo_hackathon