Merge branch 'master' of https://github.com/mjmccorm/mci-sim

Conflicts:
	js/persons.js