actually I want these
Merge branch 'master' of github.com:rglew/cis194