Changed the photo view controller to be more intuitive
Added photos that are used
Merge remote-tracking branch 'origin/master'
Fixed some merge conflicts