.
Merge branch 'master' of /home/juraj/DIPLOMOVKA/Implementacia/DP with conflicts.
Merge remote-tracking branch 'origin/master'