modify file 1
Merge branch 'master' of https://github.com/priest89/git-centralized
modify file 2 second times
Merge branch 'master' of https://github.com/priest89/git-centralized

Conflicts:
	2.txt