asdf
Merge branch 'master' of
https://github.com/aydevosotros/ExpandiendoIdeas2.git

Conflicts:
	.autotools
	.cproject