Error finalized
Merge branch 'master' of https://github.com/Ocean15/OceanGame.git