push
merge fixed
Merge remote-tracking branch 'Justin/master'
conflicted merge conflict resolution craziness
Conflicts:
	proposal.tex