Initial commit parts 1-2
Merge branch 'master' of github.com:benwang/finalproj