styling
Fix broken portfolio controller tests

Conflicts:
	app/assets/stylesheets/portfolio.css.scss
	app/views/portfolios/show.html.erb