Made a few files serializable.
Merge branch 'master' of http://github.com/Alfandorachk/330Team4
stuff