timeseries window
Merge branch 'master' of https://github.com/ChillOutHack/chillout_app
Merge pull request #10 from ChillOutHack/adam

Adam
Merge branch 'master' into adam