fixed time (again)
Merge branch 'master' of github.com:whatismagnet/FlowMPD
stupid mistake
Merge pull request #10 from yingted/master

time