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

Conflicts:
	foxtail_linkage.tex