change src/Good.java
hotfix 01
hotfix 02
update src/Good.java
Merge branch 'hotfix'

Conflicts:
	src/Good.java