Roomres ferdig layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/TestMain.java
Roomres ferdig layout