now
Merge branch 'master' of https://github.com/manguva/networks13

Conflicts:
	stub_sr/sr_router.c
sr
clean compilation