workspace.xml
Demana fer commit i no se perque
Merge branch 'master' of https://github.com/jordiCazorla/icines

Conflicts:
	.idea/workspace.xml
	nodecellar/public/js/main.js