walking works
Merge branch 'master' of http://github.com/siyuanfeng/jimmy

Conflicts:
	include/jimmy/Plan.h
	src/Plan.cpp
	src/lipm_planner.cpp