New version ..
Merge branch 'master' of github.com:jkx/DIY-Wireless-Bug

Conflicts:
	software/projects/sleep/Makefile
	software/projects/sleep/main.c