edit hallo.txt
Merge branch 'master' of https://github.com/Goforhistory/IN2_prg_practice