Merge branch 'master' into sofia
fixed addClass
Merge pull request #10 from stuycs-ml7-projects/sofia

addclass