both parts almost working
Merge branch 'master' of https://github.com/kp295/CS4670-Project3