Changes in work model
Changes in work controller
Changes in work controller
ignore last comment, rebased!
Merge remote-tracking branch 'stephaniesotw/mergetool' into mergetool

Conflicts:
	app/models/work.rb