no changes trying to pull
Merge branch 'master' of https://github.com/titse/COGS187GROUP
STUPID MERGE ERROR! ALKSFJASLK;FJASLK;
Conflicts:
	.DS_Store
	images/.DS_Store