my edits
my edits
Merge branch 'master' of https://github.com/vptarmigan/2013_reu_paper

Conflicts:
	reu_paper.tex