working on range interaction with weapons
Merge branch 'master' of https://github.com/Tadimsky/vooga

Conflicts:
	src/vooga/rts/gamedesign/Weapon.java