add more test
Merge branch 'master' of https://github.com/Fittr/fittr into dev
fix json
fix test
update test
Merge pull request #110 from Hendrixer/dev

update package.json
line-chart/bar-chart icon switch and move inline style from html to css
Merge pull request #111 from sarchila/master

line-chart/bar-chart icon switch and move inline style from html to css