Added feedback from Jaap
Merge branch 'master' of https://github.com/rjagerman/AT3

Conflicts:
	Reports/prior-work/introduction.tex
	Reports/prior-work/tribler.tex