back to master??

Conflicts:
	bigger-than-yourself/index.html
	index.html
	people/index.html
	resources/index.html
	work-in-progress/index.html