asd
Merge branch 'master' of https://github.com/madsonic/angular-tutorial

Conflicts:
	angular-tutorial.sublime-workspace
	contacts manager/contacts-manager.html
cw