lagt till RFID-detektion
Merge branch 'master' of https://github.com/hansfilipelo/MapMaster2001

Conflicts:
	Kod/Styr_m/Styr_m/Styr_m.cpp
Merge branch 'master' of https://github.com/hansfilipelo/MapMaster2001