commit
commit
Made all content that had to be serialized implement the serializable interface
Resolved conflicts