test
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	51_del3/src/spil/GameController.java
Merge branch 'master' of https://github.com/Catpaw42/Area51.git