aure's stuff
Merge branch 'master' of github.com:gabelula/mozfest_presentations