can't remember what I've done here
Merge branch 'master' of https://github.com/sebastientorres/SimpleBattleships

Conflicts:
	src/SimpleBattleships.java
some rewrtiting of the input, validation and checking of corrds