Initial commit
Merge branch 'master' of github.com:nicnocquee/Photos-
Merge branch 'develop'