added remaining people
Merge branch 'feature'