stuff works with klasserna
Merge branch 'master' of https://github.com/hansfilipelo/MapMaster2001

Conflicts:
	Kod/Kommunikation/master/master/master.cppproj
good merge