init
Merge branch 'master' of github.com:aradomski/magisterka
init