aussehen
Merge branch 'master' of https://github.com/Mattze96/miniblog

Conflicts:
	includes/footer.php
	style.css