- Time input is sec instead of ms
Merge branch 'master' of https://github.com/shunenchen/CSE218-2013-WINTER