Changes By vikas
IGnore ifle
Merge branch 'master' of https://github.com/Vikasbansal1234/DemoApp

Conflicts:
	.idea/workspace.xml
	app.js
just merge