initial commit
Merge https://github.com/cscotton/HW2