small change
Merge branch 'master' of github.com:jmsaavedra/shoes

Conflicts:
	_arduino/talkingShoe_14_noHs/talkingShoe_14_noHs.ino
Merge branch 'master' of github.com:jmsaavedra/shoes