Merge branch 'master' of github.com:rasgan/test2
zmiana