updated tempalte with new portfolio items
Merge branch 'test'
updates to front showcase styles
resolving commit issue
Merge branch 'test' of github.com:ITS-UofIowa/sitenow.uiowa.edu into test

Conflicts:
	themes/sitenow/css/styles.css
	themes/sitenow/sass/_front.scss