Initial commit
Merge remote-tracking branch 'origin/master'
to do list for 11/27
finish intro edits for flow and feminist info comments
BIG THOUGHTS: hallucinogens and access and cultural context; serotonin as related to gender and race
finish fleshing out of hallucinogen criticism
package to make graffito notes hyphenate properly
add labels and move sections around
add outline of chapters layouts
model systems justification section to mol neuro
add frustrations and celebrations list to OS case study
critical neuro: update on interdiscipline sections and reductionism analyses
add label to global science and open sci. chapters
This is for Michael Brown.
automatic spell checking edits
committee draft pre-break (12/11/14)
Merge branch 'draft' for committee submission 12/11/14
Merge branch 'draft' of github.com:kathleenleeper/div3 into draft

Conflicts:
	TheThesis/critical-neuro.lyx
	TheThesis/science-as-culture.lyx