my first commit
Merge pull request #6 from Nazick/master

my first commit