Commit masterbranch
added 2
added 3
added 6 after 3
Merge branch 'master' into testBranch

Conflicts:
	test.ts/src/TestClass.java