bad merge
Skrev tillbaka kartabstraktion
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2001

Conflicts:
	Kod/Styr_m/Styr_m/MapSection.cpp
	Skrivuppgifter/Kappa/kappa.tex