.
Merge remote-tracking branch 'Justin/master'
fixing failed merge
Conflicts:
	proposal.tex
Merge remote-tracking branch 'Justin/master'
conflicted merge conflict resolution craziness
Conflicts:
	proposal.tex
flipped arrows
Merge pull request #7 from jcchin/master

merge conflict