20141129:test
20141129:整理
Merge branch 'temp1'

Conflicts:
	.gitignore