Add file foo.txt
Merge branch 'non-fast-forward' of https://github.com/oldsharp/helloworld into non-fast-forward