Removed unneeded copies of files (Client)
Sending Player instances to Session
changes to ChallengeMessage.java
Merge branch 'master' of https://github.com/MagnusHedlund/Battleships
Moved Session to the battleships.server package
Packages make sense now
Updated Server listener
The server-side lobby is finished
Server port set to 5168
Trying to commit everything from upstream master.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Server/src/battleships/game/Submarine.java
Wanting to have the changes in catalogues and files. Merge remote-tracking branch 'upstream/master'