Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Merge branch 'master' of github.com:GloriaPG/app-node

Conflicts:
	.DS_Store
	app/.DS_Store
	app/views/.DS_Store
Merge branch 'master' of github.com:GloriaPG/app-node

Conflicts