commit

commit
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/Diffpro/Diffpro.github.io into gh-pages