Updated presentation
Merge branch 'master' of github.com:tpanum/softaware