factory girl set up with passing tests for user, friends, and events
changed friend model
fixed merge conflict in schema
Merge pull request #5 from daino3/delayed_mailers

Delayed mailers