Refactored text to my liking and added missing references
Changed names
Merge branch 'master' of https://github.com/frmi/sw605f14-latex