hy
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	js/main.js
sd
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	js/main.js
	js/view/CheckView.js
asd