more comments
Merge branch 'master' of https://github.com/jtheise/cs3402T4