name conflict

changed record to "rbc" record Baker Cat
Name conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/assets/hobmod2/sounds.json