Ignored node modules - duh!
Merge branch 'master' of https://github.com/Shepless/ng-promise-manager

Conflicts:
	.gitignore