Commiting before pull
Merge branch 'master' of github.com:sigizmund/whistler

Conflicts:
	arduino/whistler-arduino/firmware/main.cc
Refactoring and re-working
Checking stuff in on Pi and moving locally