Merge branch 'master' of https://github.com/VNovotny/RocnikovkaPC.git