Reinit
Merge branch 'master' of https://github.com/markahrens/sitenow-base

Conflicts:
	footer.php
	header.php
	index.php
	style.css