no message
Merge branch 'master' of https://github.com/aloysiusf/test

Conflicts:
	hello2.php