local 7th commit
Merge branch 'master' of https://github.com/rxy7758521/eclipse-git.git

Conflicts:
	src/com/rxy/Dog.java