committing for jdavis
Merge branch 'master' of https://github.com/csev/si664-w13