working on time frame
timeframe completed
Merge branch 'master' of https://github.com/cjwillia/grapher into phillis
minor bug
Merge branch 'master' of https://github.com/cjwillia/grapher