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

Conflicts:
	README.md
	dev/img/logo.png
	dev/php/templates/header.php
	dev/scss/core/_base.scss
	dev/scss/core/_settings.scss
	dev/scss/modules/_header.scss
	package.json
made the whole thing work with rsync
bandenscript
changes