Merge pull request #11 from ChillOutHack/adam

presentation updates
Merge branch 'master' into adam