Add git ignore
Merge branch 'master' of github.com:GloriaPG/app-node

Conflicts:
	.DS_Store