fix spelling error..
Merge branch 'UI'
Merge pull request #118 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic
Merge pull request #119 from cs2103aug2014-w15-3J/master

Merge Logic with Master