modify model associations
Add controllers, modify user views, and correct friendship association