Merge origin/master

skydningen virker!1111
Merge origin/master

skydningen virker!1111
Merge origin/master

Conflicts:
	src/battleship/implementations/Battleships.java
	src/y7/Torpedo_1.java