something
Merge remote-tracking branch 'refs/remotes/origin/master'
Almost fully completely ready report
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	rndproposal.tex