test
Jeg har kommenteret noget
comment
test 3
Merge branch 'master' of
https://github.com/ProjectGroup-CDIO/CDIOProjektOne.git

Conflicts:
	src/ProjectOne/DiceGame.java