Elaborated the solution
Resolved conflicts
Conflicts:
	vault/1/oqh/0yxcy/question.tex
Merge pull request #651 from abhinavc/master

elaborated answer + resolved conflicts