doc
Merge branch 'master' of github.com:espruino/Espruino

Conflicts:
	libs/network/cc3000/board_spi.h