Stuff?

I really need to write more detailed commits.
Merge branch 'master' of https://github.com/ElTimablo/Battleship

Conflicts:
	Board.java