Stuff
Merge branch 'master' of https://github.com/staropram/cantcoap

Conflicts:
	Makefile