Fix merge error.
Merge branch 'master' of https://github.com/irynaLv/Diploma