added some stuff to the readme
Merge branch 'master' into serialization
Woot. Basic serialization/deserialization working