Vorbereitung PPP - Technologien
Merge branch 'master' of
https://github.com/FHB-Systemintegration/project.git

Conflicts:
	README.md