decorating divider
documentation for listitems
snapshot
docs are in place
docs are in place #2
resolving conflict
merging master