changes
Merge branch 'master' of https://github.com/prateekpronoc/Angular-Assessment

Conflicts:
	js/appAngular.js