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

Conflicts:
	js/main.js
fff