Changes in work model
Changes in work controller
Changes in work controller
ignore last comment, rebased!
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
Changes in work model
Changes in work controller
Changes in work controller
ignore last comment, rebased!
Merge branch 'mergetool' of https://github.com/otwstephanie/otwarchive2 into mergetool2
ignore last comment, rebased!
Merge remote-tracking branch 'origin/mergetool' into mergetool2

Conflicts:
	app/models/work.rb
ignore last comment, rebased!
ignore last comment, rebased!
ignore last comment, rebased!
ignore last comment, rebased!