initial commit
Merge https://github.com/vivekaraj/CIS196_HW1