Merge branch 'master' of https://github.com/xiangli-cmu/raccoon into dev

Conflicts:
	router/router.go