person
Merge branch 'master' of https://github.com/pimms/newsgame

Conflicts:
	js/person.js