add friendship method to user model, friendship views and resolved devise
deleted some erb files
resolved conflicts in user and friendship model