Template stuff
Merge branch 'master' of https://github.com/naiaden/presentations
Small change and a make file!