did routes
Merge branch 'master' of https://github.com/bodhibroy/shipSimulation
fixed a merge conflict