Add serialization
Merge branch 'master' of github.com:michaeltingley/CS175

Conflicts:
	Assignment5/headers/rigtform.h
	Assignment5/headers/script.h