Fixed the looping
Merge branch 'master' of https://github.com/e111077/CrossTask

Conflicts:
	code.js