cs2103aug2014-w15-3J/Ticker — pull request #28 by nekonekonik (2014-10-06 04:17:12+00:00)
Title: Merge pull request #27 from cs2103aug2014-w15-3J/master

Merging Master into Logic branch