edit by test1
Merge branch 'master' of https://github.com/Potato2009/core

Conflicts:
	core.js