presentation stub
Merge branch 'master' of github.com:mramire8/osna