init
Merge branch 'master' of github.com:ianjuma/cs-161