.
Merge branch 'gh-pages' of https://github.com/johnnovak/photo into gh-pages