Merge branch 'master' of gl.kwarc.info:mathhub/data-proposal

# Conflicts:
#	Proposal/proposal.pdf