edits
Merge branch 'master' of https://github.com/CaptFrank/GHID

Conflicts:
	GHID_BLUNO/BLUNO_ADXL335/Src/Main/Main.atsuo