feature angepasst
feat 3
Merge branch 'feature/0004' into develop

Conflicts:
	lib/second.txt