Merge pull request #6 from tomaszrondio/master

timeline date fix
timeline fix
Merge branch 'master' of https://github.com/takeit/liveblogCeehack2014