Add user_quota method to weigh ins
Merge remote-tracking branch 'origin/front-end'

Conflicts:
	Weightable/app/views/users/index.html.erb
Merge branch 'master' of https://github.com/kendram23/weightable
Initial setup for Friends Controller
Add create method to friendship model
Add logic for pending friendships in index view
Add approve functionality to friendships controller and user index
Add decline functionality to friendships controller and user index
Merge remote-tracking branch 'origin/front-end' into friend_model
Merge pull request #43 from kendram23/friend_model

Friend model
Add show friends to users show page
Add friend button to user show page
Hide user checkins when a friendship relationship doesn't exist
Clean up user show page
Merge remote-tracking branch 'origin/master' into friend_model
Merge pull request #45 from kendram23/friend_model

Friend model
additional styling adjustments