dumb commit
Merge branch 'sunday' of https://github.com/notconfusing/wiki_econ_capability into sunday

Conflicts:
	paper/sections/discussion.tex