sdfdf
conflict resolved
Merge pull request #3 from nastiatikk/master

Conflict resolved