misc
Merge branch 'gh-pages' of github.com:danielking/photos into gh-pages