Updated for steve
Merge branch 'master' of https://github.com/csupomona-cs580/git-exercise