Initial Commit
Merge https://github.com/nmiddendorff/HW2