Hi world
hi again
Merge branch 'master' into branch1

Conflicts:
	hi.txt
Merge pull request #1 from manger719/branch1

Branch1 pull request