my first commit ever
Merge branch 'master' of https://github.com/mariioo/strona-manka