Tweak users index view - fix indenting
Merge branch 'master' of https://github.com/tonycchung/Mentor-Match-Reboot into authorization
add mentors can approve mentorships with mentees
dont show link to mentees on dashboard unless there is a pending mentorship request
only show request mentor button for mentees
Fix devise registration edit view by adding form for do f.
Add ability for mentor to change friendship state to ended.
validations on friendship model to assure that multiple frienship with the same person cannot be created and that you cannot create a friendship with yourself
fix to show edit form, still needs work
Fix edit view to sync with github master so we can merge automatically when pushing this branch.
Merge pull request #18 from tonycchung/next_mentorship

Next mentorship
Activate oauth links
Merge branch 'master' of https://github.com/tonycchung/Mentor-Match-Reboot into authorization
Move request mentorship to show page
Add some mentorship relationship tests.
Add intro page.
Fix oauth links in users/edit page.
Fix 'Got it' link in intro page
Remove bower components
Merge pull request #20 from tonycchung/combine-views

Combine views
Merge branch 'master' of https://github.com/tonycchung/Mentor-Match-Reboot into haml/sass_views