Nikki commit
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2000

Conflicts:
	Kod/Styr_m/Styr_m/mapGUI/Makefile
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2000
la till mall för teknisk dokumentation samt kappa
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2001

Conflicts:
	Kod/Styr_m/Styr_m/mapGUI/Makefile