Removed a bit and corrected errors. Remember Stefan will go through all introductions at the end...
Added todo
Merge branch 'master' of https://github.com/frmi/sw605f14-latex