feature4 v1
feature 4v2
Merge pull request #7 from PapTin/feature/feature4

Feature/feature4
Merge branch 'develop' into feature/Kregen3

Conflicts:
	dokumente/feature1.txt