my local commit
Merge branch 'master' of github.com:SummitESP/demo

Conflicts:
	code.txt
multiple file commit