time span
Merge branch 'master' of github.com:dreamyourweb/asteroid

merge