Fix git
Merge branch 'master' of https://github.com/k-stachowiak/tactic