BAM
Merge branch 'master' of https://github.com/ChrisRast/PhotoResto