AngularJS integration
Merge branch 'master' of https://github.com/kretzm/askDeepa

Conflicts:
	README.md