deleted:    .gitattributes
	deleted:    .gitignore
	deleted:    .springBeans
	deleted:    pom.xml
	deleted:    readme.md
Merge branch 'master' of https://github.com/MikeAshby/spring-petclinic

Conflicts:
	readme.md

	new file:   readme.md