change cuckoo graph example, minor rewrite
add example conflict
Merge branch 'master' of github.com:tromp/cuckoo