Started fixing photo tests
deleted tmp files
Merge branch 'dcgudeman-master'
fixed photo/show.html.erb view
Merge branch 'master' of https://github.com/ikitha/Project_2