wat
wat
Merge branch 'master' of https://github.com/umass-cs-326/team-cinnamon-crickets

Conflicts:
	.DS_Store
index.html finished?