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

Merge Logic with Master
Added construction of storage into try-catch block
Merge pull request #118 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic