[Initial commit]
Merge branch 'master' of github.com:insignia4u/MendezColladoFE

Conflicts:
	.gitignore