Ignorando archivos .cache
Merge branch 'master' of https://github.com/rogeliotoba/MariosScrum

Conflicts:
	.gitignore