triangle grid
Merge branch 'master' of https://github.com/Gerb11/Triangular
More git merge fixes