Jackie - github made me
Merge branch 'master' of https://github.com/resh2302/ClassActs

Conflicts:
	03.website/final-site/css/main.css
	03.website/final-site/css/nav.css