Initial commit
Merge conflict with readme
Merge branch 'master' of https://github.com/MarcoPolo/divergence
Merge branch 'master' of https://github.com/MarcoPolo/divergence