Changed categories table to reference user.
Modified new category form to add category to user if it doesn't exist
Resolved merge conflict in schema.
Added categories variable to feeds index action
Resolved merge conflict in feeds controller