template
Merge branch 'master' of https://github.com/JMTing/JMTing.github.io

Conflicts:
	javascripts/scale.fix.js
	params.json
	stylesheets/pygment_trac.css
	stylesheets/styles.css