update
Merge branch 'master' of github.com:justmao945/lab

Conflicts:
	go/src/github.com/justmao945/mallory
	go/src/github.com/nsf/gocode