Initial commit
Merge branch 'master' of github.com:contiki-os/contiki
README: fix the conflict for merge the new contiki

Signed-off-by: Zhong Hongbo <bocui107@gmail.com>
Merge branch 'master', remote-tracking branch 'contiki/master'
Merge remote-tracking branch 'contiki/master'
Merge remote-tracking branch 'contiki/master'
Merge branch 'master', remote-tracking branch 'contiki/master'
Merge branch 'master' of github.com:bocui107/contiki
Merge branch 'master' of github.com:bocui107/contiki