angularjs intro
Merge branch 'master' of github.com:nouh/angularjs-intro

Conflicts:
	LICENSE
	README.md