fix destroy action in friendship controller
Merge pull request #48 from codefellows/mentor_request

fix destroy action in friendship controller
Merge pull request #50 from codefellows/fix_test

Fix test
Add test for my mentees
Add first test for my_mentees_test
my mentor and my mentee page
add and re-organize my_mentors_test and my_mentees_test
Merge pull request #52 from codefellows/display-friends

Display friends
Merge branch 'master' of github.com:codefellows/Mentor-Match into mailer

Conflicts:
	app/controllers/friendships_controller.rb