untracked files on Tom: d503efe i commited something new at there .
index on Tom: d503efe i commited something new at there .
On Tom: "i added the testgit file ."
commited by Tom Callon at the tombranch.
asdfas
Merge commit '25065c38d9ec9a106939a940cdfdb257e8468a2a' into Tom

Conflicts:
	WoJianMei.xcodeproj/project.xcworkspace/xcuserdata/TomCallon.xcuserdatad/UserInterfaceState.xcuserstate
at the tom branch and i am to merge the branch and the master .