branch2 - 1st commit
Merge branch 'branch2'

Conflicts:
	src/File2.java