Changed frames for the view controllers and made the photo view controller take up the entire screen
Merge remote-tracking branch 'origin/master'
Fixed merge conflicts with project file