class 1
Merge pull request #42 from karenlin7008/master

pull request for class 2