merging, fixing regex bug and adding json
Merge branch 'gh-pages' of https://github.com/nukleas/TabulaPasta into gh-pages