Config deleted
Resolving conflict
Conflict
Merge branch 'master' of https://github.com/QJiePing/cs2103aug2014-w10-2j
Implemented user customization