Update hello.txt
New commit.
Baseline
Merge branch 'master' of https://github.com/fmontei/test
merge conflict
fixed conflict
Staging.
Added very basic Facebook functionality.