忽略文件
Merge branch 'master' of github.com:startxc/test

Conflicts:
	Runtime/Logs/14_11_05.log