generator now checks before placing person
"Generator checks before placing person"
Merge branch 'sam_branch'