edit ctrl.cpp
Merge branch 'master' of github.com:longbozhan/ctrl

Conflicts:
	ctrl.cpp
edit ctrl.cpp