Merge pull request #41 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic