Merge branch 'draft' of github.com:kathleenleeper/div3 into draft

Conflicts:
	TheThesis/critical-neuro.lyx
	TheThesis/science-as-culture.lyx
Merge branch 'draft' of github.com:kathleenleeper/div3 into draft