c
Merge branch 'master' of https://github.com/Mandy27/FinalCOGS187A

Conflicts:
	stylesheet.css
Merge branch 'master' of https://github.com/Mandy27/FinalCOGS187A