Iniciando Plataforma Colmena Labs
Merge branch 'master' of https://github.com/emmanuel86/plataforma

Conflicts:
	.gitignore
	LICENSE