wqe
Merge branch 'master' of https://github.com/GrEx0/QuQu7js
wed
qwe
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

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

Conflicts:
	js/main.js