Merge pull request #22 from Testeroids/Triangulation_Engine

Triangulation engine
Merge remote-tracking branch 'origin/master'
Update DotSettings files.
Merge remote-tracking branch 'origin/master' into Triangulation_Engine