edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/myStyle.css
Merge branch 'master' of https://github.com/dofong/COGS187AFinalProject

Conflicts:
	css/myStyle.css