Second commit
Merge branch 'master' of https://github.com/eliezer15/426Project_2