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
Add edit user function to user controller
Add new weighin to current_user
Hide weigh_in button on friend's page
add container with header inside of it for application and users layouts.
Add edit profile link to header
Merge remote-tracking branch 'origin/front-end'
Add carrierwave for image upload