workspace_compare

Conflicts:
	scripts/file.js
	stylesheets/layout.css
	stylesheets/workspace.css
build