Installed factory_girl and faker in the resources folder
Merge branch 'ting_branch'