modified:   app/controllers/events_controller.rb
	modified:   features/orderEvents.feature
	modified:   features/step_definitions/user_stories_steps.rb
Merge branch 'master' into cucumber/filterAndOrderEvents

Conflicts:
	app/controllers/events_controller.rb

	modified:   app/controllers/events_controller.rb
	modified:   app/views/events/_form.html.haml
	modified:   db/schema.rb
	modified:   db/seeds.rb
	deleted:    features/editReminderEmail.feature
	deleted:    features/editshift.feature
	deleted:    features/recurringEvents.feature
	modified:   spec/controllers/users_controller_spec.rb
	modified:   spec/factories/users.rb
Merge branch 'master' into cucumber/filterAndOrderEvents
Merge pull request #55 from dlmather/cucumber/filterAndOrderEvents

Cucumber/filter and order events