commit 1116
Merge branch 'master' of https://github.com/psideleau/shu-cs604