Hw2 initial push
Final hw2 changes
Merge pull request #3 from aguibert/master

hw2