page with little change.
Merge origin/master

Conflicts:
	src/htmlFiles/people.html