website update
Merge branch 'master' of https://github.com/mfun/mfun.github.io

Conflicts:
	help.html
	index.html