1
Merge branch 'master' of github.com:agreatfool/dummp

* 'master' of github.com:agreatfool/dummp:
  git@github.com:agreatfool/dummp.git

Conflicts:
	test.php