Workshop beamers
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher
updated ntoesx