Added form to sort and filter in views with corresponding controller method additions
	modified:   app/controllers/events_controller.rb
	modified:   app/views/events/index.html.haml
	modified:   app/views/shifts/_form.html.haml
Merge branch 'master' of github.com:dlmather/cs169-mainproject

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/index.html.haml

	modified:   app/controllers/events_controller.rb
	modified:   app/controllers/rotations_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/controllers/volunteers_controller.rb
	modified:   app/mailers/shift_notifier.rb
	modified:   app/views/appointments/availability.html.haml
	modified:   app/views/events/_form.html.haml
	modified:   app/views/events/index.html.haml
	modified:   app/views/rotations/index.html.haml
	modified:   app/views/shift_notifier/coordinator_notify.html.haml
	modified:   config/routes.rb
	modified:   spec/controllers/appointments_controller_spec.rb
	modified:   spec/controllers/users_controller_spec.rb
	modified:   spec/factories/users.rb
	new file:   spec/factories/volunteers.rb
	modified:   spec/mailers/shift_notifier_spec.rb
	modified:   spec/spec_helper.rb
Merge branch 'feature/recurringEvents' of github.com:dlmather/cs169-mainproject into feature/orderAndFilterEvents
Found debugger stuff and removed
	modified:   app/mailers/shift_notifier.rb
	modified:   db/schema.rb
Merge branch 'master' into feature/orderAndFilterEvents

Conflicts:
	app/models/event.rb

	modified:   spec/controllers/events_controller_spec.rb
	modified:   spec/controllers/volunteers_controller_spec.rb
	modified:   spec/views/events/edit.html.erb_spec.rb
	modified:   spec/views/events/index.html.erb_spec.rb
	modified:   spec/views/events/new.html.erb_spec.rb
Merge branch 'master' into feature/orderAndFilterEvents

Conflicts:
	app/models/event.rb

	modified:   app/assets/javascripts/dates.js
	modified:   app/controllers/events_controller.rb
	modified:   app/controllers/rotations_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/controllers/volunteers_controller.rb
	modified:   app/models/event.rb
	modified:   app/models/shift.rb
	modified:   app/views/events/_form.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   config/environments/test.rb
	modified:   config/routes.rb
	modified:   features/adminAccount.feature
	modified:   features/createshift.feature
	modified:   features/deleteevent.feature
	modified:   features/editReminderEmail.feature
	modified:   features/editevent.feature
	modified:   features/editshift.feature
	modified:   features/orderEvents.feature
	modified:   features/recurringEvents.feature
	modified:   features/reminder.feature
	modified:   features/step_definitions/user_stories_steps.rb
	modified:   features/support/paths.rb
	modified:   features/volunteers.feature
	modified:   spec/controllers/shifts_controller_spec.rb
	modified:   spec/factories/events.rb
	new file:   spec/factories/rotations.rb
	modified:   spec/factories/shifts.rb
Merge pull request #52 from dlmather/feature/orderAndFilterEvents

Feature/order and filter events