local commit
Merge branch 'master' of https://github.com/Vikky/petclinic

Conflicts:
	src/main/resources/db_readme.txt
deleted src and included from github