This is all
c
Merge branch 'master' of https://github.com/eduardoacv2/StoreApp-EL-ICOM5016

Conflicts:
	.gitignore