Nonsense
conflict resolved
uploading photos and tests
Merge branch 'master' of https://github.com/ProDef/picture_this into photos