header changes
Merge branch 'master' of https://github.com/Kah0ona/slate_tyrex

Conflicts:
	dev/php/templates/footer.php
slider