installed FactoryGirl
Merge branch 'master' into issue_18
Merge pull request #19 from landtax/issue_18

Issue 18