new changes done
Merge branch 'master' of https://github.com/pugmarx/pugtex

Conflicts:
	index.html