c
update
update
Merge branch 'master' of github.com:anderlu/blaze

Conflicts:
	DriverJavaScript/readme.txt