todict
Merge branch 'master' of https://github.com/helme/bachelor2014
likelihood und dict