first commit
Merge https://github.com/piratte/PVU-zapoctak