Assignment 2.1 citizen and nobleperson
Merge remote-tracking branch 'origin'