Create shop custom object (See if ok standard CRUD)
Create Visualforce page
git ignore settings
Merge branch 'master' of https://github.com/globant/salesforce-training

Conflicts:
	src/package.xml