updates
Merge branch 'master' of github.com:tophertimzen/cs115