Fix the bug when you enter a letter instead of integer in readYAxis.
Fix the conflict in Game class.
Merge branch 'master' of github.com:GlasgowCaley/Battleships-IP2014