Merge branch 'release/initialRelease' into develop
Added a ship
Added string
Merge branch 'hotfix/addString'
Merge branch 'hotfix/addString' into develop
Merge branch 'feature/addShipController' into develop
Release 2
Merge branch 'release/release2'