2D triangle works correctly
2D triangle works correctly
lab2 fixed
Merge branch 'master' into 2D