AACM 8 task
DB 6
Merge branch 'master' of bitbucket.org:etoestja/inf