timeScale doesn't work now
fixed conflict
Merge branch 'master' of https://github.com/cjwillia/grapher
Merge branch 'master' of https://github.com/cjwillia/grapher
fixed minor bug
Merge branch 'master' of https://github.com/cjwillia/grapher