Hw2 - Merge

hw2 Merge, even though I accidentally already committed hw2 as master