Rewrote discussion; wrote conclusion
Merge branch 'rewrite-discussion'