Detect folder clash if there's any and react according to it
Merge branch 'master' of https://github.com/cs2103aug2014-t16-2j/main.git