additional info
Merge branch 'master' of https://github.com/maarjooreehehe/csc193