Changes in chart
Conflict Removed
Merge branch 'master' of https://github.com/tbedi/Ticker