touched workspaces.hbs
Merge branch 'master' of https://github.com/bengyindrive/piston-cup

Conflicts:
	app/assets/javascripts/templates/workspaces.hbs
fixed workspace issues