First commit
Merge https://github.com/akaver/Diplom