Merge branch 'gh-pages' into json-extension
added js functionality to distinguish photos with 2 animals vs 1 animal
Merge branch 'json-extension' into gh-pages