Added race to Person as OptionalCharField
Moved to a ManyToMany relationship for future proofing
Reconciled merge conflict