Minor change.
Fix minor change.
Change for first tests.
Fix conflict.
Merge branch 'master' of github.com:GlasgowCaley/Battleships-IP2014