added people template
Merge branch 'master' into agreggation

Conflicts:
	templates/people.html