Added stuff to evaluation overall, merged chapters.
Merge branch 'master' of https://github.com/Wikzo/p7_paper