TestCommit

Added by pc
Merge remote-tracking branch 'origin/TestBranch' into buildWithMac

Conflicts:
	Workspace/Assignment2/src/q1/TriangleArea.java