Readme conflict resolved
Master is merged with square
Removed computing in GeomSolver.class with square
Merge branch 'master' of github.com:jgmdv/geom-solver into Square