features/volunteers passes
features/recurriingEvents updated, still red
features/orderEvents updated, still red
features/adminAccount passing
Finish half of rspec tests for shifts_controller and implement more factories.
features/editevent passing
Add more tests for shifts_controller.
Unable to hit update action.
Merge pull request #48 from dlmather/shifts_controller_testing

Shifts controller testing
features/editReminderEmail features/editShift features/orderEvents features/recurringEvents failing
Merge branches 'master' and 'justin/test_coverage'
Remove erroneous shifts.
Little shits
	modified:   app/controllers/rotations_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/mailers/shift_notifier.rb
	modified:   app/models/shift.rb
	modified:   app/views/events/_form.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   config/routes.rb
Merge branch 'master' into bug/debugger

Conflicts:
	config/routes.rb

	modified:   config/routes.rb
	modified:   spec/controllers/shifts_controller_spec.rb
	modified:   spec/factories/events.rb
Merge pull request #50 from dlmather/bug/debugger

Bug/debugger
Merge branch 'master' of github.com:dlmather/cs169-mainproject
Fix errors from idiotic addition to routes.
Merge pull request #51 from dlmather/shifts_redo

Fix errors from idiotic addition to routes.
repeating events now work
Weird magic merge