method
Merge branch 'master' of https://github.com/notconfusing/wiki_econ_capability

Conflicts:
	paper/biPartiteWikipedia.tex