k
j
yes

:wq

XXXX
llll

Merge branch 'master' of https://github.com/angrysnail/workspace

Conflicts:
	python/python_test/.settings/org.eclipse.core.resources.prefs
kdkd