[merge]
Merge branch 'master' of github.com:freecx/diploma