Added more to serialization, still not tested
Merge branch 'master' of https://github.com/kwicen/Assignment1