Update foo
add test file
Merge branch 'master' of git.corp.yahoo.com:heijmans/flaming-octo-cyril