save current changes
Merge commit 'ec0c754c347afbd9d1799df00d6957c1fd783f8f' into engine_test

Conflicts:
	lib/__pycache__/d40lib.cpython-34.pyc
	lib/__pycache__/echo.cpython-34.pyc