added factories file to spec folder with fake data to use for future testing. Added factory girl test data for each migration .
trying to resolve conflict
fixed conflict for real this time
moved test files into model folder
fixed merge conflict
Merge pull request #10 from meara/factories_file

added factories file to spec folder with fake data to use for future tes...