Initial commit
initial commit
Merge remote-tracking branch 'Standort38/master'

Conflicts:
	.gitignore
	css/main.css
	css/media-queries.css
	js/main.js
	startseite.html