Updated Background image and scrolling behaviour
Merge branch 'master' of https://github.com/jeffzheng1/BeginnerHackathon
Merge branch 'master' of https://github.com/jeffzheng1/BeginnerHackathon

Conflicts:
	main.css