Support research into basic income
Merge branch 'refs/heads/gh-pages' into basic_income

Conflicts:
	economy.md
Merge pull request #82 from openpolitics/basic_income

Support research into basic income