Merge branch 'master' of github.com:fergmastaflex/portfolio_piece

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.scss