Clarification on lab.
Merge branch 'master' of github.com:zappala/cs460

Conflicts:
	templates/winter-2014/labs/network-simulation.html