before stephanie edits
Merge branch 'master' of https://github.com/dwhit/RSS_ingredients

Conflicts:
	paper_template.tex
4pm draft