FInalized Assignment 1
hw2
commit because I need to merge homework2 into master
merge from homework2 to master