ethan's edits
Merge branch 'master' into cf
Merge remote-tracking branch 'ae/master' into ae
Merge branch 'ae' into cf

Conflicts:
	foxtail_linkage.tex
Merge branch 'cf'