hw2 upload
Merge pull request #19 from xlinda/master

hw2 upload