Neue
Merge branch 'master' of https://github.com/gavargas22/SlackenTie-V2

Conflicts:
	css/style.css
	header.php