Arreglar veurePelícules
Merge branch 'master' of https://github.com/jordiCazorla/icines
Merge branch 'backoffice'

Conflicts:
	nodecellar/public/js/main.js
Afegit el fitxer de pelicules
Merge branch 'backoffice'

Conflicts:
	.idea/workspace.xml
	nodecellar/public/css/home.css
	nodecellar/public/index.html
	nodecellar/public/js/main.js