mergemerge
Merge remote-tracking branch 'origin/master'

* origin/master:
  ALLES KAPUTT GEMACHT
  merge
  merge
  merge
  added comments in planet.rb
  modified Ship.rb