my solution
Merge branch 'master' of https://github.com/styata0/JavaWithFriends