E2
Merge branch 'master' of https://github.com/SamuelSorge/RequirementsEngineeringUebungen

Conflicts:
	system_b/SinkFilter.java