Update testpush.php
Update testpush.php
Update testFile.php
Update testpush.php
Merge branch 'master' into NewBranch

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

Conflicts:
	testpush.php
Update testpush.php
Merge branch 'master' into NewBranch

Conflicts:
	testpush2.php
'test'
Merge pull request #11 from mlienart/NewBranch

New branch