Merge branch 'master' of https://github.com/the-maldridge/whosin into the-maldridge-master

Conflicts:
	RFID.py
	whosin275.py