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 edit user function to user controller
Add new weighin to current_user
Hide weigh_in button on friend's page
Add edit profile link to header
Merge remote-tracking branch 'origin/front-end'
Add carrierwave for image upload
Add rmagick for image resizing
Add home page for signin and authenticated root for home page
Add logic to user show page when goal_weight isn't present
Add logic to user show page when goal_weight isn't present
Add signout link to navbar
Hide weigh_in button until a goal weight is set
User edits for authentication
Add registrations controller override for new user sign_in
Merge pull request #17 from kendram23/user_controller

Add registrations controller override for new user sign_in
Add sessions controller to restrict user edit