commit 2 akagi
Merge branch 'branch_2'

Conflicts:
	TestProject/src/Hello.java