updating person
Merge branch 'master' of https://github.com/karinachan/savethenet

Conflicts:
	templates/profile.html