Find is master or slave
Merge branch 'masterslavemerge' of https://github.com/pjrh/rpi-radio-control into masterslavemerge

Conflicts:
	keypad_monitor.py