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

Merging Master into Logic branch