debugging
Merge branch 'master' of https://github.com/sconine/photo-display