Merge pull request #129 from cs2103aug2014-w15-3J/master

Merge Logic with Master
removed import TickerUI
Finalised test classes
Merge pull request #130 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic