Updated apostrophes
MERGE

Conflicts:
	groups/2/css/main.css
	groups/2/index.html
Update Colors
Updated map locations
Updated quilt
Update Sarah Phillipps Bio
Merge pull request #16 from dspearl/master

Group 6 Submission