Edited and prettied up
Resolved conflicts

Conflicts:
	vault/2/goh/r77zt/question.tex
Merge pull request #861 from abhinavc/master

Edited and prettied up 2/goh/r77zt