Merge branch 'chuyu-storage' of github.com:cs2103aug2014-w13-4j/main into pn-logic
Integrate chuyu's code into logic
Merge branch 'pn-logic' of github.com:cs2103aug2014-w13-4j/main into pn-modify-chuyu-storage