Inicial
Merge branch 'master' of https://github.com/ecorona/37310765

Conflicts:
	.gitignore