modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	modified:   app/controllers/tasks_controller.rb
	modified:   app/views/categories/index.html.erb
	new file:   app/views/tasks/destroy.rjs
	modified:   app/views/tasks/index.html.erb
	modified:   config/database.yml
	modified:   spec/controllers/categories_controller_spec.rb
	modified:   spec/controllers/tasks_controller_spec.rb
	modified:   spec/controllers/user_controller_spec.rb
	modified:   spec/models/category_spec.rb
	modified:   spec/spec_helper.rb
	deleted:    Gemfile~
	deleted:    app/assets/javascripts/ajax.js~
	deleted:    app/assets/javascripts/application.js~
	deleted:    app/controllers/categories_controller.rb~
	deleted:    app/controllers/tasks_controller.rb~
	deleted:    app/views/categories/index.html.erb~
	deleted:    app/views/categories/show.html.erb~
	deleted:    app/views/layouts/application.html.erb~
	deleted:    app/views/tasks/index.html.erb~
	deleted:    config/database.yml~
	deleted:    spec/controllers/categories_controller_spec.rb~
	deleted:    spec/controllers/tasks_controller_spec.rb~
	deleted:    spec/controllers/user_controller_spec.rb~
	deleted:    spec/views/categories/index.html.erb_spec.rb~
	deleted:    spec/views/index.html.erb_spec.rb~