8th commit new
8th commit master
Merge branch 'new'

Conflicts:
	src/com/rxy/Dog.java