Add new column contents to articles and delete the wrong version of migration file.
Fix collisions in database
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing into cucumberTest
Change in database
Fix some errors in step_definitions
Category show page changed and related rspec testing. Seeds.rb changed in order to test subcategory system.
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing into cucumberTest
a
a