class edit
Merge pull request #130 from katiewood/master

class edit