Preparing for pulling changes from remote
Fix conflicts
Repaired schema.rb and properly used nested_form for categories