renamed js to json
split user data files from workout files
commented out bottle
fixed NaN targets on "today" page
- fixed Merge branch 'master' into HEAD

* master:
  renamed js to json split user data files from workout files commented out bottle fixed NaN targets on "today" page

Conflicts:
	js/script.js