updated files
merging branch
Merge branch 'master' of https://github.com/Jabela/Week3Project

Conflicts:
	stylesheet.scss