solved one of the “headers already sent” errors
Solved small conflict in functions-php
Merge branch 'master' of https://github.com/Walkingmage/OHLALA

Conflicts:
	functions.php