Modify hello-world for test master branch
Add conflict for conflict test
Merge branch 'master' of https://github.com/LearnToMe/LearnToMe
Handle the conflicts
Conflicts:
	_posts/2013/2013-05-25-Hello-World.md