init commit
git ignore
Merge branch 'master' of github.com:javiermanzano/angular-js-node-js-example

Conflicts:
	.gitignore