angular directives
Merge branch 'master' of github.com:mikeplavsky/express-one

Conflicts:
	views/angular.ejs