測試起衝突該如何處理  (source tree)
Merge branch 'master' of https://github.com/hidog/test

Conflicts:
	SQLite_Test/xcode/xcode/main.cpp