js
Merge branch 'master' of https://github.com/peersa/SimPerprojekt

Conflicts:
	HTML/StockenCamping.html
Merge branch 'master' of https://github.com/peersa/SimPerprojekt