first commit
merge conflit
Merge pull request #2 from Alex237/master

first commit