add dictionaryFromXML
mm
Merge branch 'class'

Conflicts:
	PlantAndZombieMain/PlantAndZombieMain.xcodeproj/project.xcworkspace/xcuserdata/liwenhao.xcuserdatad/UserInterfaceState.xcuserstate
push web dictioanry