Added 1-2
Merge branch 'master' of https://github.com/orablu/eecs290-project2