More discussion, and wikipedia reference
Merge branch 'master' of https://github.com/benjambj/TFE4140
Fix bibliography url on onel ine
Fixes and discussion contents