Added and adjusted threshold for boss cross area.
fixed merge problem.
Merge branch 'master' of https://github.com/Thebanjodude/PECO_LOLAII

Conflicts:
	PECO_LOLAII.sprj
	PECO_LOLAII.wsp