github change something and local server add something at same time
before pull, change something at same file
let us see what happen with it
again
Merge branch 'master' of https://github.com/flamelad/gitForLearn

Conflicts:
	README.md
Merge branch 'master' of https://github.com/flamelad/gitForLearn

Conflicts:
	README.md
restart