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

Conflicts:
	www/templates/announcement.html