start of hw7.
Merge branch 'master' of github.com:taitsmp/cis194