change cat weight
Merge branch 'secondBranch'

Conflicts:
	src/main/HelloWorld.java