test commit 1
test commit 2
test commit 2
test commit 2 PR
Merge branch '1.3.0' of https://github.com/WooDzu/GitTest into 1.3.0-testing-branch

Conflicts:
	testfile.php
Merge pull request #1 from WooDzuTest/1.3.0-testing-branch

Addition from WooDzuTest