backup for 9-19
Merge branch 'master' of https://github.com/marshalltj/cs370
backup