Updated lab10
Merge branch 'master' of github.com:PNHilfinger/61a-sp14-website

Conflicts:
	lab/lab10/lab10.php