commite from local 2
test1
test
file added
Merge branch 'master' of https://github.com/baliramprasad/git2

Conflicts:
	fileCreatedFromLive