Improved list()
Merge branch 'Logic' of https://github.com/cs2103aug2014-w15-3J/main.git into Logic