added new feature, second class
Merge remote-tracking branch 'origin/master' into newClassFeature
more feature stuff
more comments