init
Merge branch 'master' of github.com:maxmeyer/presentation_template