Feature-Required Task 6: photo zooms correctly to show max
Merge branch 'feature-required_task_6' into develop
Feature-Required Task 8: recents work
Merge branch 'feature-required_task_8' into develop