Merge branch 'master' of https://github.com/jlg2012/trening
Merge branch 'master' of https://github.com/jlg2012/trening