Creating template
upload
Upload
Adding README
Adding README
Merge branch 'master' of https://github.com/darkadan/mps2magento

Conflicts:
	LICENSE