Changes to input validation. Actually works now (we think)
Merge branch 'master' of https://github.com/GlasgowCaley/Battleships-IP2014

Conflicts:
	src/uk/ac/gcu/battleships/Player.java