master - 1
recreate prj
ignore setting
Merge branch 'br1'

Conflicts:
	src/Test.java