Updated what we do text and scalingproblems with portfolio
Merge branch 'master' into portfolio-section

Conflicts:
	app/styles/portfolio.scss
Fixed portfolio rendering when resizing screen; added "What we do" content

Merge branch 'portfolio-section'
Fixed the black line issue in portfolio - still have to fix the margin between thumbnails of portfolio
Fixed conflict