gitIgnore
Merge branch 'dev' of https://github.com/Ereos/sin-mala-espina.git into
dev
Conflicts:
	.gitignore