Made one line change to person.rb
Merge branch 'scaffold'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/SpeciesFileGroup/taxonworks
Merge branch 'master' of https://github.com/SpeciesFileGroup/taxonworks