fixing merge conflicts
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
fixed resizings