update
update
Merge branch 'master' of
https://github.com/judking4/com.judking.python.test

Conflicts:
	.settings/org.eclipse.core.resources.prefs