Changes and stuff
Merge branch 'master' of https://github.com/frmi/sw605f14-latex