Even simplier version
Merge branch 'master' of https://github.com/zxhadow/zxhadow.github.io

Conflicts:
	index.html