added resources helper spec
added FactoryGirl gem
Merge branches 'master' and 'working'