added therubyracer to gemfile
began work on shift views
modified routes to reflect event has-a shift relation
added missing views
	new file:   app/assets/javascripts/shifts.js.coffee
	new file:   app/assets/stylesheets/shifts.css.scss
	new file:   app/controllers/shifts_controller.rb
	new file:   app/helpers/shifts_helper.rb
	new file:   app/models/shift.rb
	new file:   app/views/events/index.html.haml
	new file:   app/views/events/show.html.haml
	new file:   app/views/shifts/_form.html.haml
	new file:   app/views/shifts/edit.html.haml
	new file:   app/views/shifts/index.html.haml
	new file:   app/views/shifts/new.html.haml
	new file:   app/views/shifts/show.html.haml
	new file:   db/migrate/20131101224238_create_shifts.rb
	new file:   features/coverage/assets/0.4.5/app.js
	new file:   features/coverage/assets/0.4.5/fancybox/blank.gif
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_close.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_loading.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_nav_left.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_nav_right.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_e.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_n.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_ne.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_nw.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_s.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_se.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_sw.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_shadow_w.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_title_left.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_title_main.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_title_over.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancy_title_right.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancybox-x.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancybox-y.png
	new file:   features/coverage/assets/0.4.5/fancybox/fancybox.png
	new file:   features/coverage/assets/0.4.5/fancybox/jquery.fancybox-1.3.1.css
	new file:   features/coverage/assets/0.4.5/fancybox/jquery.fancybox-1.3.1.pack.js
	new file:   features/coverage/assets/0.4.5/favicon.png
	new file:   features/coverage/assets/0.4.5/jquery-1.4.2.min.js
	new file:   features/coverage/assets/0.4.5/jquery.dataTables.min.js
	new file:   features/coverage/assets/0.4.5/jquery.timeago.js
	new file:   features/coverage/assets/0.4.5/jquery.url.js
	new file:   features/coverage/assets/0.4.5/loading.gif
	new file:   features/coverage/assets/0.4.5/magnify.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-icons_222222_256x240.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-icons_2e83ff_256x240.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-icons_454545_256x240.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-icons_888888_256x240.png
	new file:   features/coverage/assets/0.4.5/smoothness/images/ui-icons_cd0a0a_256x240.png
	new file:   features/coverage/assets/0.4.5/smoothness/jquery-ui-1.8.4.custom.css
	new file:   features/coverage/assets/0.4.5/stylesheet.css
	new file:   features/coverage/index.html
	new file:   features/coverage/resultset.yml
	new file:   spec/controllers/shifts_controller_spec.rb
	new file:   spec/helpers/shifts_helper_spec.rb
	new file:   spec/models/shift_spec.rb
	new file:   spec/requests/shifts_spec.rb
	new file:   spec/routing/shifts_routing_spec.rb
	new file:   spec/views/shifts/edit.html.erb_spec.rb
	new file:   spec/views/shifts/index.html.erb_spec.rb
	new file:   spec/views/shifts/new.html.erb_spec.rb
	new file:   spec/views/shifts/show.html.erb_spec.rb
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/events_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/models/event.rb
	modified:   app/models/shift.rb
	new file:   app/views/events/_form.html.haml
	new file:   app/views/events/edit.html.haml
	modified:   app/views/events/index.html.haml
	new file:   app/views/events/new.html.haml
	modified:   app/views/shifts/index.html.haml
	modified:   config/routes.rb
	new file:   db/migrate/20131103045043_create_shifts.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	deleted:    app/assets/javascripts/shifts.js.coffee
	deleted:    app/assets/stylesheets/shifts.css.scss
	deleted:    app/helpers/shifts_helper.rb
	deleted:    app/views/events/_form.html.erb
	deleted:    app/views/events/edit.html.erb
	deleted:    app/views/events/new.html.erb
	deleted:    app/views/events/show.html.haml
	deleted:    app/views/shifts/_form.html.haml
	deleted:    app/views/shifts/edit.html.haml
	deleted:    app/views/shifts/new.html.haml
	deleted:    app/views/shifts/show.html.haml
	deleted:    db/migrate/20131101224238_create_shifts.rb
	deleted:    spec/controllers/shifts_controller_spec.rb
	deleted:    spec/helpers/shifts_helper_spec.rb
	deleted:    spec/requests/shifts_spec.rb
	deleted:    spec/routing/shifts_routing_spec.rb
	deleted:    spec/views/shifts/edit.html.erb_spec.rb
	deleted:    spec/views/shifts/index.html.erb_spec.rb
	deleted:    spec/views/shifts/new.html.erb_spec.rb
	deleted:    spec/views/shifts/show.html.erb_spec.rb
can create shifts linked to events
can delete shifts
shift CRUD operations implemented, notice changed to flash in ShiftController
	new file:   app/views/shifts/edit.html.haml
Merge branch 'feature/add_shift'
Merge branch 'master' of https://github.com/dlmather/cs169-mainproject

Conflicts:
	Gemfile
	app/views/events/_form.html.haml
	app/views/events/edit.html.haml
	app/views/events/index.html.haml
	app/views/events/new.html.haml
	config/routes.rb
	db/schema.rb

	modified:   .gitignore
	modified:   Gemfile
	modified:   Gemfile.lock
	deleted:    app/assets/javascripts/jquery.nivo.slider.js
	new file:   app/models/user.rb
	new file:   app/views/devise/confirmations/new.html.haml
	new file:   app/views/devise/mailer/confirmation_instructions.html.haml
	new file:   app/views/devise/mailer/reset_password_instructions.html.haml
	new file:   app/views/devise/mailer/unlock_instructions.html.haml
	new file:   app/views/devise/passwords/edit.html.haml
	new file:   app/views/devise/passwords/new.html.haml
	new file:   app/views/devise/registrations/edit.html.haml
	new file:   app/views/devise/registrations/new.html.haml
	new file:   app/views/devise/sessions/new.html.haml
	new file:   app/views/devise/shared/_links.haml
	new file:   app/views/devise/unlocks/new.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
	new file:   app/views/events/show.html.haml
	new file:   app/views/layouts/_banner.html.haml
	deleted:    app/views/layouts/application.html.erb
	new file:   app/views/layouts/application.html.haml
	modified:   app/views/static_pages/home.html.haml
	new file:   config/initializers/devise.rb
	new file:   config/locales/devise.en.yml
	modified:   config/routes.rb
	deleted:    coverage/assets/0.4.5/app.js
	deleted:    coverage/assets/0.4.5/fancybox/blank.gif
	deleted:    coverage/assets/0.4.5/fancybox/fancy_close.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_loading.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_nav_left.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_nav_right.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_e.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_n.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_ne.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_nw.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_s.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_se.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_sw.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_shadow_w.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_title_left.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_title_main.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_title_over.png
	deleted:    coverage/assets/0.4.5/fancybox/fancy_title_right.png
	deleted:    coverage/assets/0.4.5/fancybox/fancybox-x.png
	deleted:    coverage/assets/0.4.5/fancybox/fancybox-y.png
	deleted:    coverage/assets/0.4.5/fancybox/fancybox.png
	deleted:    coverage/assets/0.4.5/fancybox/jquery.fancybox-1.3.1.css
	deleted:    coverage/assets/0.4.5/fancybox/jquery.fancybox-1.3.1.pack.js
	deleted:    coverage/assets/0.4.5/favicon.png
	deleted:    coverage/assets/0.4.5/jquery-1.4.2.min.js
	deleted:    coverage/assets/0.4.5/jquery.dataTables.min.js
	deleted:    coverage/assets/0.4.5/jquery.timeago.js
	deleted:    coverage/assets/0.4.5/jquery.url.js
	deleted:    coverage/assets/0.4.5/loading.gif
	deleted:    coverage/assets/0.4.5/magnify.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-icons_222222_256x240.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-icons_2e83ff_256x240.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-icons_454545_256x240.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-icons_888888_256x240.png
	deleted:    coverage/assets/0.4.5/smoothness/images/ui-icons_cd0a0a_256x240.png
	deleted:    coverage/assets/0.4.5/smoothness/jquery-ui-1.8.4.custom.css
	deleted:    coverage/assets/0.4.5/stylesheet.css
	deleted:    coverage/index.html
	deleted:    coverage/resultset.yml
	new file:   db/migrate/20131103014453_devise_create_users.rb
	modified:   db/schema.rb
	deleted:    features/step_definitions/userstory_steps.rb~
	new file:   spec/models/user_spec.rb