pushing some stuff I dunno
Merge branch 'master' of https://github.com/bodhibroy/shipSimulation