changing message
Merge branch 'pr/2'

Conflicts:
hello.php
Merge branch 'pr/2'