backup
Merge remote-tracking branch 'origin/master'

Conflicts:
	proto/controller_pb2.py
	src/controller.pb.cc
	src/controller.pb.h
	src/hello.pb.cc
	src/hello.pb.h
add closure