adding hello
Merge branch 'delete-prut'

Conflicts:
index.php
edditing