files: binding oi
merge conflict
modules created
Merge branch 'master' of https://github.com/indika/functional