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

Conflicts:
	.project
Merge branch 'master' of https://github.com/GrEx0/QuQu7js
f
Merge branch 'master' of https://github.com/GrEx0/QuQu7js

Conflicts:
	index.html
Merge branch 'master' of https://github.com/GrEx0/QuQu7js