created migration to add columns to comments table for polymorphic associations
	modified:   Gemfile
added 'meta_request' gem to allow RailsPanel to work. this is used for debugging.

	modified:   db/schema.rb
ran db:migrate for the changes maded to comments table for polymorphic so rails generated this file.
Added new field for admin permissions
Don't forget ti run db:migrate and db:test:prepare
removed protect_from_forgery because the controller is already inherting from the application controller
	modified:   app/models/comment.rb
  added in polymorphic associations

	modified:   app/models/event.rb
  updated association to comments to account for polymorphic association to comments
	modified:   app/models/user.rb
  updated association to users to account for polymorphic association to comments

	modified:   db/migrate/20130607184849_add_column_to_comments_for_polymorphic.rb
  fixed mistake in the fields' names for polymorphic association
Created seeding file and made user_id accessible for event, seed for testing purposes
fixed naming mistake of fields' name for polymorphic association
Added partial for edit and delete on a event to integrate the possibility to view -or not- based on the user -creator of the event, admin
app/views/events/_links.html.erb

Edited single event partial and event show page to integrate the partial
app/views/events/_single_event.html.erb
app/views/events/show.html.erb
	modified:   app/controllers/comments_controller.rb
  updated create action to adapt to polymorphic changes to comments table

	modified:   app/models/comment.rb
  updated associations to account for conversion to polymorphic table

	modified:   app/views/comments/_form.html.erb
  updated form for polymorphic changes. will need to alter again soon to account for commenting on a comment

	modified:   app/views/events/show.html.erb
  updated view for comments table polymoprhic conversion

	modified:   db/schema.rb
  updated by rails due to rake db:migrate
	modified:   app/controllers/comments_controller.rb
  updated create action to take in new commentable params being passed in from the view

	new file:   app/helpers/comments_helper.rb
  created file to create a recursive function to display the comments on comments. still working on it

	modified:   app/views/comments/_form.html.erb
  updated form to pass in commentable object

	modified:   app/views/events/show.html.erb
  updated form to use commentable object being passed in by using hidden field
	modified:   app/controllers/events_controller.rb
  updated show action to include all_comments of an event

	modified:   app/helpers/comments_helper.rb
  created children method for query speed, and to extract the child of a parent passed into the method

	modified:   app/models/event.rb
  created all_comments method to grab all of the comments include its children

	modified:   app/views/comments/_show.html.erb
  moved form from show.html.erb into the partial
  moved upvote/downvote into the partial
  created recursive rendering for all of the comment's child

	modified:   app/views/events/show.html.erb
  updated view to create recursive rendering of the comments. rendering comments on comments
Updated tests to match new classes, and to test with different types of users (admin, creator and random user)
spec/factories/events.rb
spec/features/comments_spec.rb
spec/features/events_spec.rb
Merge branch 'master' into dev

Conflicts:
  db/schema.rb
  -removed date, rails auto update this...
	modified:   app/helpers/comments_helper.rb
  -added exception when list is nil

	modified:   db/schema.rb
  -rails updated automatically

	modified:   spec/factories/events.rb
  -fixed associations of all of the factories to associate to the user

	modified:   spec/features/comments_spec.rb
  -changed all of the lets to account for the factory changes in associations

	modified:   spec/features/votes_spec.rb
  -updated tests to add in .reload so that capybara can reload the page after submitting
  advised by jared
Added gem 'omniauth-google-oauth2'

	modified:   Gemfile

Added a check in create to see if the user is logging in with google (Auth)
	modified:   app/controllers/session_controller.rb

Added methods to create or find users that are logging in with google
	modified:   app/models/user.rb

Added a link to log in using google
	modified:   app/views/users/_login.html.erb

Setup keys for omniauth (need to hide)
	new file:   config/initializers/omniauth.rb

Added match '/auth/google_oauth2/callback' => "session#create"
	modified:   config/routes.rb

Added a uid column and provider column for omniauth
new file:   db/migrate/20130608012223_add_columns_to_user_for_omni_auth.rb
Merge branch 'master' into take-3

Conflicts:
	Gemfile.lock
Added a session[:user_id] if you log in with google

	modified:   app/controllers/session_controller.rb
	modified:   app/models/event.rb
  updated associations to include event_confirmation

	new file:   app/models/event_confirmation.rb
  created event_confirmation table

	modified:   app/models/user.rb
  updated associations to make the relationships more readable
  added relationships to the event_confirmation table and through it
  decision 0 = declined
  decision 1 = accepted
  decision 2 = maybe

	new file:   db/migrate/20130608011032_create_event_confirmations.rb
  created event_confirmation table for a user's decision to attend an event

	modified:   db/schema.rb
  autoupdated by rails
Merge branch 'attendees'

Conflicts:
  db/schema.rb
autoupdated by rails
Removed unneccesary methods, they were redundant
modified:   app/controllers/session_controller.rb

Added tests for logging in with google
  modified:   spec/features/user_spec.rb

Created a stub and mock to implement google login tests
	new file:   spec/support/omniauth_helper.rb