test 2
Merge branch 'master' of
https://github.com/sambaum/BI-ZHAW-SoftwareProjekt.git

Conflicts:
	MultiChannel/src/User.java