- fixing merge conflict
renamed js to json
split user data files from workout files
commented out bottle
fixed NaN targets on "today" page