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

Conflicts:
	imager.js
	screen2.html
Merge branch 'master' of https://github.com/YHack-Slash/yhack-slash.github.io