stuff
blah
merge
Merge remote-tracking branch 'Justin/master'
fixing failed merge
Conflicts:
	proposal.tex