Merge pull request #2 from zxj/test

add test file
sign changed by master branch
add merge from test branch files
Merge branch 'master' of https://github.com/zxj/DreamWorks

test
Merge branch 'master' into test

Conflicts:
	a.txt