Merge pull request #2 from mlienart/NewBranch

testFile
Merge pull request #3 from mlienart/NewBranch

New branch
aaa
Merge branch 'master' of https://github.com/mlienart/hello-world
aaa
zzz
commit bbb

commit bbb
Merge branch 'master' into NewBranch

Conflicts:
	testpush2.php
Merge branch 'NewBranch' of https://github.com/mlienart/hello-world into NewBranch

Conflicts:
	testpush.php