added jbox 2d for handling ships and bullets
Changed indentation
fixed merge conflicts