weapon collision started
Merge branch 'master' of https://github.com/DigohD/CR

Conflicts:
	src/com/cr/entity/hero/Hero.java