scond commit
Merge pull request #1 from alehsieh/master

test from student1