ssss
jjh
Merge branch 'master' of https://github.com/ddaanniieell2/test_proj1.git

Conflicts:
	src/pl/test/proj1/TestClass2.java