added some timeline stuff
fixed merge conflicts
making progress on timeline - it has the data points now, but does not display the data
Merge branch 'master' of https://github.com/JamesRen/GetThere