added echo for testing
deleted.
Merge branch 'master' into rasppi-2

Conflicts:
	killmotion
a;lskdjf;laksjf;laksjfd;alkjs