task 1 done
Merge branch 'master' of https://www.github.com/Arnatar/uni