Initial commit
Added shape to ship
resolved asteroid and ship conflicts
removed merge conflict stuff
Fixed bullet direction