strange formatting, fixing bugs
Merge branch 'gh-pages' of https://github.com/nukleas/TabulaPasta into gh-pages

Conflicts:
	javascripts/TabulaPasta.js