fix 001
problemi....
Merge branch 'master' of github.com:trulex/TPO

trying to fix stuff001
deleting allready deleted stuff all over again
Merge branch 'lovrenca'