added hello
more text to home page
merge feature/one
new line added
Merge branch 'feature/one'
changed heading
feature/one meld
remove index orig