can't remember what i changed
Merge branch 'master' of https://github.com/iqabsent/cge-hwai

Conflicts:
	movebox.js