updating files in server
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'
Updating files and adding test-files.
Adding tests
Merge pull request #7 from uipo/master

Adding tests and some upated files