ignore .idea folder
Updated Gemfile
Merge branch 'master' into feature/exercise_calculator
Convert height and weight to metric measurements.