Updates to lab
Merge branch 'master' of https://github.com/zappala/cs460

Conflicts:
	templates/winter-2014/labs/reliable-transport.html