testMac1
commit2
Merge branch 'master' of https://github.com/masanorisone/testrep2.git

Conflicts:
	TestPJ2/src/Main2.java