alles!
Merge branch 'master' of https://github.com/Icepick/php_fachkompetenzen

Conflicts:
	abfragen.php
	css/styles.css
	search.php