foo
Merge branch 'master' of https://github.com/haches/git_demo

Conflicts:
	hello_world.txt