Smallish corrections
added a sequence diagram to makefile
Merge branch 'master' of github.com:bachelor-2014/report
Whoops, wrong filename
Merge branch 'master' of github.com:bachelor-2014/report