committing change done here in local
Merge branch 'master' of https://github.com/ruchis1588/testrepo

Conflicts:
	style.css.txt