Heroku
Merge branch 'master' of github.com:ProjectShepherd/shepherd
Remove instances of photo_type