added friendly comment for progress method
created category model and wrote simple specs
created category join table categorized_objects
fixed merge conflicts