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