Merge branch 'master' of https://github.com/mdeluca/mmed6000sample

Conflicts:
	Readme.txt
nuked it