General commit
Merge branch 'master' of https://github.com/YHack-Slash/yhack-slash.github.io

Conflicts:
	screen1.html
	screen2.html