initial text for example
Merge branch '2.0.0' into lp/conflict-resolution-example
Merge branch 'bugs/lp/conflict-resolution-changes' into lp/conflict-resolution-example
small mistakes in AAE theory doc
Merge branch '2.0.0' into lp/conflict-resolution-example
remove example section
add introductory paragraphs
a smatter of code samples
finish java example
more explanation
fix wiki links at the bottom
add note on ConflictResolverFactory
finish python example
change one word
add ruby example code
change global nav
fix global nav
add new directory
fix global nav and metadata
add write logic to java example