Simplified checks and added comments to 'extrapolateCoordinates()'
Fixed imports, added tests and fixed bound check
Merge remote-tracking branch 'origin/gamelogic-sprint2' into gui-sprint2
Moved 'placeShip()' to BoardSetup
Merge remote-tracking branch 'origin/gui-sprint2' into gamelogic-sprint2

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
Fixed BoardSetup
Moved getShipStack() to its own class, this should make stuff a bit mor readable
Merge remote-tracking branch 'origin/gamelogic-sprint2' into gui-sprint2

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
Fixed merge error