Merge branch 'master' of https://github.com/OregonShakespeareFestival/captioncast

Conflicts:
	app/controllers/upload_controller.rb
	app/models/data_file.rb
	app/views/upload/uploadfile.html.erb
Merge branch 'views'

Conflicts:
	app/controllers/upload_controller.rb
	app/models/data_file.rb
	app/views/upload/uploadfile.html.erb
small fix to upload controller - still needs work
added visuals to the operator view