changes
Merge branch 'master' of https://github.com/PramukJay/stockapp

Conflicts:
	www/js/app.js
	www/js/services.js