Fixed conflicts to merge successfully
commit
added triangle
Merge branch 'master' of https://github.com/JohnMariHinolan/geom-solver-fork into JohnMariHinolan-master
Modified GeomSolverV2.java
Merge branch 'master' of https://github.com/jgmdv/geom-solver-fork