started the thing
merged
Documentation: basic form done
Merge branch 'master' of github.com:trulex/TPO
Merge branch 'master' into lovrenca
doc done
Merge branch 'master' of github.com:trulex/TPO
Merge branch 'lovrenca'
cleanup