minor
Merge branch 'master' of github.com:pratikac/6.261

Conflicts:
	writeup/macros.tex
minor