Added my Dice Roll example, and fixed the link to the Sieve of Eratosthenes example (the button wasn't showing up in the dropdown)
get file to pass jshint
fix merge conflict
fix merge conflict
rebuilt dist files
Auto-scroll deemed unnecessary given advent of scratchspace, so the 'if(workspace)' block of the 'drag' function in scripts/drag.js has been commented out.
Merge branch 'master' of https://github.com/waterbearlang/waterbear
created date block
Merge pull request #689 from waterbearlang/dateBL

created date block
created zh-tw directory
Merge branch 'master' into diff

Conflicts:
	dist/arduino.js
	dist/javascript.js
	dist/node.js
	dist/processingjs.js
	scripts/file.js
build
use history API to create diff state