Adding user profile setting to choose kg/lbs, and converting in the workout detail view based on setting
Workout set display in user preference selected unit of measuer (kg/lb) +test
Missed this in the last commit, somehow
Adding django-measurements to the reqs - fixes import error
Fix accounts migration to use 'lb' instead of 'lbs', add __init__.py to the accounts/migrations, and modify the form to use lbs first in the drop down (shameless optimization for my own workouts)
Set defaults for the new columns in workoutset, weight_measure = 'Weight(g)' and weight_unit = 'lb'. This is to make sure the existing records don't break the page
Merge pull request #11 from AnthonyHonstain/unit-conversion

Unit conversion
Fixing a bug in the migration script (I SHOULD have validated this before checking my 'quick fix' in)
Merge branch 'develop' into workoutset-crud-ajax
Incremental check in, adding another column to track order, and starting to expose the functionality to modify order