A change
Merge branch '1stBranch'

Conflicts:
	bin/somePackage/HelloWorld.class
	src/somePackage/HelloWorld.java