Update attribute names in cucumber tests to reflect actual

	modified:   features/createshift.feature
	modified:   features/editshift.feature
Added case where we create a new shift and @shift.volunteer_id is not defined

	modified:   app/views/shifts/_form.html.haml
Merge branch 'master' into feature/volunteerInfoInShiftForm
Merge branch 'feature/volunteerInfoInShiftForm' into cucumber/volunteerInfoInShiftForm
Fixed some user stories

	modified:   db/schema.rb
	modified:   features/createshift.feature
Merge branch 'master' into cucumber/volunteerInfoInShiftForm

Conflicts:
	app/views/shifts/_form.html.haml
	db/schema.rb

	modified:   ../app/assets/javascripts/shift.js
	modified:   ../app/assets/stylesheets/application.css
	modified:   ../app/controllers/shifts_controller.rb
	modified:   ../app/models/shift.rb
	modified:   ../app/models/volunteer.rb
	modified:   ../app/views/devise/sessions/_login.html.haml
	modified:   ../app/views/events/_form.html.haml
	modified:   ../app/views/events/edit.html.haml
	modified:   ../app/views/events/new.html.haml
	modified:   ../app/views/layouts/application.html.haml
	modified:   ../app/views/shifts/_form.html.haml
	modified:   ../app/views/shifts/edit.html.haml
	modified:   ../app/views/shifts/index.html.haml
	modified:   ../app/views/shifts/new.html.haml
	modified:   ../app/views/volunteers/index.html.haml
	modified:   migrate/20131103045043_create_shifts.rb
	new file:   migrate/20131122225928_add_temp_col_to_volunteers.rb
	deleted:    migrate/20131125003214_add_recurring_column_to_volunteer.rb
	modified:   schema.rb
	modified:   seeds.rb
Fixed some more user stories

	modified:   db/schema.rb
	modified:   features/editshift.feature
	modified:   features/reminder.feature
Added email field to shift form and fixed some user stories

	modified:   Gemfile.lock
	modified:   app/views/shifts/_form.html.haml
	modified:   features/createshift.feature
	modified:   features/editReminderEmail.feature
	modified:   features/editshift.feature
	modified:   features/reminder.feature
Merge branch 'feature/editShiftEmailText' into feature/volunteerInfoInShiftForm

Conflicts:
	app/views/shifts/_form.html.haml

	modified:   Gemfile.lock
	modified:   app/assets/javascripts/shift.js
	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/shifts_controller.rb
	modified:   app/models/shift.rb
	modified:   app/models/volunteer.rb
	modified:   app/views/devise/sessions/_login.html.haml
	modified:   app/views/events/_form.html.haml
	modified:   app/views/events/edit.html.haml
	modified:   app/views/events/index.html.haml
	modified:   app/views/events/new.html.haml
	modified:   app/views/layouts/application.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   app/views/shifts/edit.html.haml
	modified:   app/views/shifts/index.html.haml
	modified:   app/views/shifts/new.html.haml
	modified:   app/views/volunteers/_form.html.haml
	modified:   app/views/volunteers/index.html.haml
	modified:   app/views/volunteers/show.html.haml
	modified:   db/migrate/20131103045043_create_shifts.rb
	new file:   db/migrate/20131122225928_add_temp_col_to_volunteers.rb
	deleted:    db/migrate/20131125003214_add_recurring_column_to_volunteer.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	modified:   features/createevent.feature
	modified:   features/createshift.feature
	modified:   features/editReminderEmail.feature
	modified:   features/editshift.feature
	modified:   features/reminder.feature
	modified:   features/step_definitions/user_stories_steps.rb
	modified:   features/volunteers.feature
	modified:   spec/controllers/events_controller_spec.rb
	modified:   spec/controllers/volunteers_controller_spec.rb
	new file:   spec/factories/users.rb
	modified:   spec/requests/events_spec.rb
	modified:   spec/requests/volunteers_spec.rb
	modified:   spec/spec_helper.rb
	new file:   spec/support/controller_macros.rb
	new file:   spec/support/devise_support.rb
	modified:   spec/views/events/show.html.erb_spec.rb
Merge branch 'feature/volunteerInfoInShiftForm' into cucumber/volunteerInfoInShiftForm

Conflicts:
	features/createshift.feature
	features/editshift.feature
	features/reminder.feature

	modified:   ../Gemfile.lock
	modified:   ../app/views/events/_form.html.haml
	modified:   ../app/views/events/index.html.haml
	modified:   ../app/views/layouts/application.html.haml
	modified:   ../app/views/shifts/_form.html.haml
	modified:   ../app/views/volunteers/_form.html.haml
	modified:   ../app/views/volunteers/show.html.haml
	modified:   createevent.feature
	modified:   createshift.feature
	modified:   editReminderEmail.feature
	modified:   editshift.feature
	modified:   reminder.feature
	modified:   step_definitions/user_stories_steps.rb
	modified:   volunteers.feature
	modified:   ../spec/controllers/events_controller_spec.rb
	modified:   ../spec/controllers/volunteers_controller_spec.rb
	new file:   ../spec/factories/users.rb
	modified:   ../spec/requests/events_spec.rb
	modified:   ../spec/requests/volunteers_spec.rb
	modified:   ../spec/spec_helper.rb
	new file:   ../spec/support/controller_macros.rb
	new file:   ../spec/support/devise_support.rb
	modified:   ../spec/views/events/show.html.erb_spec.rb
Merge branch 'master' into cucumber/volunteerInfoInShiftForm

Conflicts:
	app/views/shifts/_form.html.haml
	features/createshift.feature
	features/editshift.feature

	modified:   app/controllers/shifts_controller.rb
	modified:   app/views/events/_form.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   app/views/shifts/show.html.haml
	modified:   features/createshift.feature
	modified:   features/editshift.feature
Made all tests pass.  Deleted un-testable tests

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/shift.js
	modified:   app/views/shifts/_form.html.haml
	modified:   features/createshift.feature
	modified:   features/editshift.feature
	modified:   features/reminder.feature
	modified:   features/step_definitions/user_stories_steps.rb
	modified:   features/support/env.rb
Merge branch 'iteration3-2' of github.com:dlmather/cs169-mainproject into iteration3-2

Conflicts:
	features/editReminderEmail.feature
	features/step_definitions/user_stories_steps.rb

	modified:   app/views/shifts/_form.html.haml
	modified:   db/schema.rb