included solution to question and created versions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vault/2/jfh/y5q7x/question.tex
Merge pull request #636 from adamarla/master

included solution to question and created versions