typing error fix

Fixed typing error in main.js file, regarding projectile to ship
collission
Merge remote-tracking branch 'origin/master'

Conflicts:
	Teamwork - The Game/scripts/main.js