make routes functional.
Add new weighin route
Reconfigure routes for users and weigh_ins
Add changes to weigh_in controller
merged changes.
Merge pull request #15 from kendram23/user_controller

User controller
Merge branch 'master' into weigh_in_controller

Conflicts:
	Weightable/config/routes.rb
Changes from origin.
Merge pull request #16 from kendram23/user_controller

User controller
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
Added devise controllers
User change
Merge branch 'master' into weigh_in_controller

Conflicts:
	Weightable/app/controllers/users_controller.rb
Add callbacks to user controller
Merge branch 'weigh_in_controller' into user_controller

Conflicts:
	Weightable/app/controllers/users_controller.rb
add suggestions from nicole
Merge branch 'master' of https://github.com/kendram23/weightable into front-end

Conflicts:
	Weightable/app/views/users/show.html.erb