Commit efore pull
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main
Touches up ControllerTest and StorageTest
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main