gh
Merge branch 'master' of https://github.com/Walter89/ProgramTesting.git

Conflicts:
	testlabb1/src/TriangleTest.java