merge
Merge branch 'master' of https://github.com/Fittr/fittr
fix routes
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
clean up package json
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
added more left margin to chart to provide more room for larger numbers
merge
changed the initial y values for the chart datasets to zero. removes the initial flash of fake data
Merge branch 'master' of https://github.com/Fittr/fittr
added  on splash
changed the y value of the initial chart data set to 0.1. this removes the dots seen on the charts
removed merge conflict line
Merge branch 'master' of https://github.com/Fittr/fittr into splash
set the chart's interpolation to linear
Merge pull request #129 from sudostack/splash

Splash