utf8
Merge branch 'master' of github.com:binzo/phptest

Conflicts:
	java/com/binzo/test/TestMain.java