first commit for cp2
Merge https://github.com/lisztfan/15-441-project-1