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.
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
fixed naming mistake of fields' name for polymorphic association
	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
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