third commit
Merge branch 'staging' of github.com:sawangupta92/test_project into staging

Conflicts:
	test1