modified
Merge branch 'master' of https://github.com/rkpuri/myapp

Conflicts:
	package.json