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

Conflicts:
	killmotion
a;lskdjf;laksjf;laksjfd;alkjs
a;lsjdf;lajs;lfdja;lsjfd;lajslfd