bootstrap update

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/peersa/SimPerprojekt

Conflicts:
	.idea/workspace.xml
	HTML/StockenCamping.html