removes devise gem; removes controllers for tdd; adds facebook authentication to user model
fixes merge conflict