working on ObjectToStringTest. need to check for null in serialization
ObjectToStringTest passes
Merge branch 'master' of github.com:pcpratts/rootbeer1

Conflicts:
	src/org/trifort/rootbeer/entry/DontDfsMethods.java
ObjectToStringTest passes