Fix project 2 in order to combine with project 3
Add final project base code
Merge branch 'master' of github.com:dhalman/csc344