commit by elvis
Merge branch 'master' of github.com:FreeYourMind/tongxunlu

Conflicts:
	Tongxunlu/Tongxunlu.xcodeproj/project.pbxproj
commit by elvis
remove test file