added an example of serializing with avro
fixed some merge conflicts