Minor edits
Merge branch 'master' of https://github.com/cs61bl/labs

Conflicts:
	lab7/lab7.md