November 15

Lots of changes
Merge branch 'master' of https://github.com/hejtmy/DiplomkaGit