presentation update 2
Merge branch 'master' of https://github.com/WYSIWYG-Fan/PrAct