5th Commit

Changes we made together in the HTML and SASS files.
merge conflict