Rspec merges into the Main
adding update items ability
Fixed Bugs
merging files
Remove redundant gem file
adding 'category' field to items model; this will be one of the fields used for generating the swappaholic api
fixing gemfile
adding trade data table and associations to User and Item models