update
Merge branch 'master' of https://github.com/CodeForRockford/codeforrockford

Conflicts:
	people.html
	projects.html
	repo.html
	resource.html
	resources.html