commit
Merge branch 'master' of https://github.com/dima888/AD

Conflicts:
	bin/.gitignore
	bin/Aufgabe_1_2/Experemente.class