cleaned up
old
Merge branch 'master' of https://github.com/simonwrafter/LUR7

Conflicts:
	initial can/main.c