Added slides on di and directives
Merge branch 'master' of https://github.com/tsov/AngularJS-Talk into tsov-master

Conflicts:
	app/js/app.js
	content.txt
A few changes after what we went through at starbucks
Merge pull request #5 from rchodava/master

sync from ravi