a teml change for local
Merge branch 'master' of https://github.com/ShwetaTaral/my-test-repo

Conflicts:
	assets/js/main.js