test
Brainstorming
change network
Merge branch 'master' into Sprint1-Network
renamed package
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship into Sprint1-Network
Merge remote-tracking branch 'origin/gamelogic-sprint1' into Sprint1-Network

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/Board.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/ships/GenericShip.java
Fixed conflict
Merge remote-tracking branch 'origin/Sprint1-Network' into gui-sprint1

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/Board.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/ships/GenericShip.java
Implemented interface for a player
- Made distinction between local player and opponent, this will help in
the network implementation
- Defined Opponent class (where placeShot() triggers a network call)
- Defined LocalPlayer class (where placeShot() evaluates stuff)
Implemented player with more generic approach
Merge remote-tracking branch 'origin/gui-sprint1' into gamelogic-sprint1

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