cs2103aug2014-w15-3J/Ticker — pull request #47 by nekonekonik (2014-10-11 13:25:24+00:00)
Title: Merge pull request #44 from cs2103aug2014-w15-3J/master

Merge Logic with Master