Main and project created
Merge branch 'master' of https://github.com/magkur/AnimalPark

Conflicts:
	.classpath