Initial working version
Merge branch 'master' of https://github.com/dave-turvey/photosite.git