Updated Gemfile
Merge branch 'master' into feature/exercise_calculator
Convert height and weight to metric measurements.
move the calculate library as it will encompass more than just mets
Adding decisions based on morning conversation
Merge remote-tracking branch 'origin/feature/exercise_calculator' into feature/calculation-library

Conflicts:
	config/application.rb
Update libraries for use with new calculations. Add wrappers to find weight and time
Merge branch 'feature/calculation-library'

Conflicts:
	Gemfile.lock
	config/application.rb
add additional weight
migrations rake task to load exercises
added rake task to delete db data
Merge branch 'feature/db_rake_task'
Create items table and modify exercises table to join with items
Add foods table, and really truly push the item migrations this time
merged feature/create_foods_table
Created Food model and added attr_accessible to Item model
Merge branch 'feature/create_foods_table'
added items csv
revised config root
merged master