prueba3
Merge branch 'master' of github.com:Exxu/cosmec-si

Conflicts:
	cosmec/cosmec.cpp