Timeline, markers,

Signed-off-by: Laure Boutmy <laureboutmy@gmail.com>
Merge branch 'master' of https://github.com/loupyestu/winter-is-coming