update foot .
Merge branch 'master' of github.com:vicowong/git-test

Conflicts:
	foot.txt