test modification
Merge branch 'master' of https://github.com/wzhscript/videoProject.git

Conflicts:
	src/com/wzhscript/Transition.java