first commit
Merge branch 'master' of github.com:gimm/express-angular-grunt-seed

Conflicts:
	.gitignore