added simple save/load functions
fixed conflicts after hw4 merge
DEAL WITH IT