initial commit
Merge branch 'master' of github.com:pololee/cs-118-2