progrs
Merge branch 'master' of github.com:Kah0ona/slate_tyrex

Conflicts:
	dev/php/templates/header.php
	dev/scss/modules/_header.scss