Implemented damage methods for ship, cleaned TODOs
Merge branch 'gamelogic-sprint1'

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/Board.java