added second "hi"
Merge remote-tracking branch 'origin/master'