Merge origin/master

Conflicts:
	src/y7/Torpedo_1.java
firestrategi leget med
Merge origin/master

Conflicts:
	src/y7/Torpedo_1.java