Zwischenbericht Final version
Merge branch 'master' of github.com:hellerbarde/cpib
Used version from repo

Conflicts:
	cpib_HS-2014_Gruppe_10_ZB_v1.pdf