more thing
Merge branch 'master' of github.com:xsubtut/xsubtut.github.io

Conflicts:
	index.md
regen