fixed background image display passed scroll
Merge branch 'master' of https://github.com/Drew-Garvey/gmu-senior_show-14

Conflicts:
	.sass-cache/820a293a16da00f2c138c1980a1fa0a1ce96040c/base.scssc
	.sass-cache/820a293a16da00f2c138c1980a1fa0a1ce96040c/nav.scssc
	css/style.css