Commit inicial
Merge branch 'master' of https://github.com/MatayoshiMariano/mimascota

Conflicts:
	.gitignore