Run bundle install.
Temporary change to get sendgrid approval.
Fix spacing issue.
Add delayed_job gem to schedule email jobs, remove sendgrid tag from landing page, change notifier method.
Update configuration settings to work with heroku and sendgrid.
Add default heroku email to shift notify.
Added a reminder email feature to shifts view and model
Merge branches 'feature/reminderEmail' and 'master'
Add reminder to shifts such that on creation an email is sent to remind volunteers of their shifts.
Add delayed_job gem to schedule email jobs, remove sendgrid tag from landing page, change notifier method.
Update configuration settings to work with heroku and sendgrid.
Add default heroku email to shift notify.
Add reminder to shifts such that on creation an email is sent to remind volunteers of their shifts.
Add migration for email field, and add email text to email view.
Fix merge conflicts.
Merge pull request #15 from dlmather/email_schedule

Email schedule
view edit for adding volunteer info directly when editing/creating shifts
Merge branch 'master' into feature/volunteerInfoInShiftForm

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

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/shifts_controller.rb
	modified:   app/mailers/shift_notifier.rb
	modified:   app/models/shift.rb
	modified:   app/views/shift_notifier/shift_notify.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   config/environment.rb
	modified:   db/migrate/20131103045043_create_shifts.rb
	new file:   db/migrate/20131124082527_create_delayed_jobs.rb
	new file:   db/migrate/20131124231921_add_reminder_to_shifts.rb
	new file:   db/migrate/20131125010056_add_email_to_shifts.rb
	modified:   db/schema.rb
merged ronnie's code in
optional volunteer saving is now functional