hard coded/drew things into timeline
adding timelines
Merge branch 'master' of https://github.com/JamesRen/GetThere