spacepeople pull working
Fixes spacepeople model
Fixes spacepeople model
Merge branch 'spacemen'