shiz iz better
Merge remote-tracking branch 'origin/master'
backgrounds and nav gradient
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/global.css
	scss/global.scss