my part
Merge branch 'master' of github.com:hoany/diploma