first commit
Merge https://github.com/Onceadin/homework