task1_1 first commit
Merge pull request #3 from kexife/master

task1_1 first commit merge kexife