cleaning + removed todos
Merge branch 'master' of https://github.com/MarcSpitz/ldebroux_kjadin_masters-thesis_2014