adding timeline view
Merge branch 'master' of github.com:myobie/boarderland