gitignore
updated screencast
update for s3
use static
use cloudfront instead
update
update stable
convert .rvmrc

Conflicts:
	.rvmrc
todo
Merge remote-tracking branch 'origin/master' into advanced

Conflicts:
	.gitignore
	bookmarklets/selectorgadget.js
	bookmarklets/selectorgadget_edge.js
	doc/index.html
Merge branch 'master' into advanced
this path should not be changed
ignore the bin directory when uploading
Merge branch 'master' into advanced
Merge branch 'advanced' into chrome