user tests with factory girl
Merge pull request #52 from marklc44/master

user tests with factory girl