huge changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	sass/_vars.scss
changes