Merge
Merge branch 'master' of https://github.com/darzul/photo_viewer