before DB
Merge remote-tracking branch 'origin/master'

Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.css.map
	img/Bild_01.jpg
	img/Bild_02.jpg
	img/Bild_03.jpg
	img/Bild_04.jpg
	index.html
	js/functions.js
	js/index.html
	style.css
	style.css.map
	style.scss
	werkstatt.html