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

Conflicts:
	index.html