First commit
Merge branch 'master' of https://github.com/pimsuwan/prestashop

Conflicts:
	README.md

	modified:   README.md