Set up final scaffolding for team members
Merge branch 'master' of https://github.com/CS113/fatty-big-star

Conflicts:
	index.html