Fixed crazy glitch when Xwing collides with a ship
Merge branch 'master' of https://github.com/Yiiii/NeonCha

Conflicts:
	NeonCha/NeonCha.pde