Add new weighin route
Reconfigure routes for users and weigh_ins
Add changes to weigh_in controller
Merge branch 'master' into weigh_in_controller

Conflicts:
	Weightable/config/routes.rb
Fixed current weight bug on show page
Merge branch 'master' into weigh_in_controller
Weigh in merge, still need to fix user association
Merge branch 'master' of https://github.com/kendram23/weightable