Most info in slides
Merge branch 'master' of https://github.com/lolnic/uniNotes2014