- Delay sample
- test
- Fixed conflict
Merge branch 'master' of https://github.com/Amputeur/DickJohnson

Conflicts:
	DickJohnson/DickJohnson.ino