added Factory Girl
Merge branch 'master' of https://github.com/EricLowber/Bloccit