Clean-up and implemented example 2.
Merge branch 'master' of https://github.com/oaqa/oaqa-tutorial
cleaned up, and implemented example 2