Extracter dritt fra tank.class til controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/arcade/tankwars/Tank.java
	src/com/example/arcade/tankwars/TankWarsUserInterface.java
Prøver fikse en pushefeil