project 2 wrap up
Merge branch 'project2' of github.com:Shavakan/cs341 into project2