Added ship classes.  Moving into real game.
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/main.pde