Update README.md
Merge branch 'master' into feature
Merge branch 'feature'
Merge branch 'master' of https://github.com/SharnieIvery/photomap