Week 3
Merge branch 'master' of github.com:cgildea/cecs475