Readme
Merge branch 'master' of https://github.com/sdefauw/contiki into 6lowpanND

Conflicts:
	README.md