..
....
Merge branch 'master' of https://github.com/vinylcadg/script

Conflicts:
	scripts/melon.core.js