project skeleton
Merge branch 'master' of github.com:hansenrl/cs118-project1