Made factory girl attributes match models, added missing column recommended_time to resources
Added resource routes for stones.
Added StonesController.
Added a stones index page.
Corrected typo made during application initialization.
Fixed merge conflict.
Fixed merge conflict in stone.rb
Fixed a few bugs in seed file.