start drawing ship
ship initial position
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/asteroids/Ship.java