first commit
Merge branch 'master' of https://github.com/alice90270/lab8