added a slide, report stuff
merge conflicts and stuff
Merge branch 'master' of https://github.com/kanto-player/kanto-paper