new question
 simplified solution
Resolved conflicts
Conflicts:
	vault/1/wyh/jdfsv/question.tex
Merge pull request #693 from abhinavc/master

new question + conflicts resolved