resolve conflict
Merge pull request #16 from BeshoSmile/samouka3925_GitTask

resolve conflict
@ahmedsamouka Your code is somehow good :D