Fix 2 test warnings
Merge pull request #3 from rcdilorenzo/master

Fix JSON response for status API to include user information and fix 500 error
Merge pull request #4 from rcdilorenzo/fix_test_warnings

Fix 2 test warnings
Add factory_girl
Do more friendship testing and add more friendship functionality
Update README.rdoc
Fix bug in which canceling an account caused a 500 error and broke the website
Change factory_girl to factory_girl_rails
Add user's friends index page and do more testing
Establish friendship acceptance views and do more testing
Add mutual_friendship and accept_mutual_friendship - do more testing
Add delete friendships ability and do testing
Styling tweaks
Styling tweaks, again
Add button changes on profiles during friending process and testing
Add mailer functionality, reverse order of statuses on profile page, and extras
Final touches
Change antisocial email address
Build 'Activity Feed'
Finish Activity Feed