merge
Merge branch 'master' of https://github.com/jenniferdr/humanoide
merge
Conflicts:
	Arbotix/caminar/caminar.ino