Msg
Merge branch 'master' of https://github.com/titse/COGS187GROUP

Conflicts:
	.DS_Store