project files
Merge branch 'master' of https://github.com/FHeiwig/Praktikum1

Conflicts:
	WebShop/.idea/workspace.xml