asdf
Merge branch 'master' of https://github.com/exehs/magentoEquipe2

Conflicts:
	README.md