Check diffs.
Merge branch 'master' of https://github.com/s2tephen/edrum-arduino

Conflicts:
	edrum.ino
Checking diffs.