Refactored text and moved the options that we do not use to a list. Also added todos that we have to look at :)
Merge branch 'master' of https://github.com/frmi/sw605f14-latex