Added factory girl
Small join + 2 more test passing
Merge pull request #1 from icehero/pr

Pr