code
Merge branch 'master' of https://github.com/suresh-123/demo

Conflicts:
	file.html