class 2
Merge pull request #40 from karenlin7008/master

class 2