updated portfolio section
Merge branch 'master' of https://github.com/Visualbam/portfolio

Conflicts:
	app/assets/stylesheets/layout.css.scss
s