140826
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	v0.2/garnet.js
140826