final form of timeline- DON'T MAKE THINGS TOO LONG
Merge branch 'master' of https://github.com/JamesRen/GetThere