Changed portfolio text
3 cols in portfolio layout
Update What we do text
Merge branch 'master' into portfolio-section

Conflicts:
	app/styles/portfolio.scss