cs2103aug2014-w15-3J/Ticker — pull request #26 by nekonekonik (2014-10-03 15:48:21+00:00)
Title: Logic

Merging edited UserInput class and Logic class