primeros bullets de mate
Merge branch 'master' of github.com:HuayraLinux/huayra-bullets

Conflicts:
	huayra-bullets-build.py
primeros bullets mate
bullets de mate finales, falta TDA