Add height_in_feet and height_in_inches columns to User model for BMI calculation on User show page
Added height_in_feet and height_in_inches to form on initial info modal box
Merge branch 'master' of https://github.com/krytlewski/fatcamp into add_height_to_user_model

"Add master branch into add_height_to_user_model branch for testing of height_in_feet and height_in_inches in modal box form and User model"
Add height_in_feet and height_in_inches as strong params so user input in modal saves in appropriate columns in User model
Add BMI calculator to controller and add to user show page
Add record weight (lowest weigh in) to user show page
Hide timeline and points on timeline for xs screen sizes.
Add BMI calculator and record weight (lowest weight) to user show page
Minor fix to BMI calculator for cases for obese users
Merge branch 'master' of https://github.com/krytlewski/fatcamp into profile-comments

Conflicts:
	weightable_practice_scaffolding/app/views/users/show.html.erb
Merge branch 'master' of https://github.com/krytlewski/fatcamp into profile-comments

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