resync
resync
Merge branch 'master' of https://github.com/fewesttwo/tshirt

Conflicts:
	README
resync to pi