Correcciones varias
Agregado gitignore
Merge branch 'master' into develop

Conflicts:
	.travis.yml
Merge pull request #1 from etenesaca/develop

Develop to Master