Hw2

hw2 pull into master branch