text
mergeMerge branch 'master' of github.com:/hansfilipelo/MapMaster2001

Conflicts:
	Skrivuppgifter/Reglering/regler.tex