commit to pull in scots work
fixing merge conflicts
Merge branch 'app-redo' of github.com:Hendrixer/Fittr into charts
chart now pulls data from db
code cleanup
Merge pull request #35 from Hendrixer/charts

Charts now use live data