Added Anne
Merge branch 'master' of https://github.com/larsplaul/demo1

Conflicts:
	src/demo1/Demo1.java
Added Susanne
Merge RemoteRepository/master

Conflicts:
	src/demo1/Demo1.java