update blarg
update blarg
update blarg
Merge branch 'master' of https://github.com/JeanRintoul/herohacks

Conflicts:
	sdk/samples/.DS_Store
	sdk/samples/hello-myo.cpp