Added para 351
Updated 351
Merge branch 'master' of https://github.com/shenCode/CoT.git

Conflicts:
	bin/Area.class
	bin/Player.class