merge
Merge branch 'master' of https://github.com/hspinks/cs108
Merge branch 'master' of https://github.com/hspinks/cs108