update
Merge branch 'master' of
https://github.com/evanlan1983/spring-petclinic.git

Conflicts:
	english_studying/english.txt