small change
Merge branch 'master' of https://github.com/emetchar/RH_proj

Conflicts:
	src/ProjectileController.as