header, about, partners
Merge remote-tracking branch 'origin/master'

Conflicts:
	_prototype/.sass-cache/6890164f9a8f3f6631f2822f640922f2f6a709ed/_mixins.scssc
	_prototype/.sass-cache/6890164f9a8f3f6631f2822f640922f2f6a709ed/main.scssc
	_prototype/css/main.css
	_prototype/index.html
	_prototype/sass/main.scss