re-edited
Merge branch 'master' of https://github.com/kpawel-29/GitBox