added approved_friends test to user spec
Merge branch 'master' into compare_tests
Merge pull request #51 from edatrix/compare_tests

Compare tests