Fejl rettet
Merge origin/master

Conflicts:
	src/demo1/Demo1.java