segund try
ad
Merge github.com:zurcx/zurc2_dance

Conflicts:
	.gitignore
dlete