to do
ds
ds
5 replace
ds

Conflicts:
	.DS_Store
	code/CurrentStuff/.DS_Store
	code/CurrentStuff/MQTT/.DS_Store
	code/CurrentStuff/MQTT/MQTT_IR_RC_5/MQTT_IR_RC_5.ino
Merge branch 'master' of https://github.com/gitmaster2013/multiremote

Conflicts:
	.DS_Store
	code/CurrentStuff/.DS_Store
	code/CurrentStuff/MQTT/.DS_Store
	code/CurrentStuff/MQTT/MQTT_IR_RC_5/MQTT_IR_RC_5.ino
to do
ds