merge gh-pages from upstream#2

ap0ught wants to merge 3 commits intoap0ught:gh-pagesap0ught/json-diff:gh-pagesfrom

zfil:gh-pageszfil/json-diff:gh-pagesCopy head branch name to clipboard