27. 12. 2013
Merge branch 'master' of https://github.com/borisvida/diplomovka

Starting merge