Added function to check for conflicting task

Refactor logic test as well, as it affect the test cases.
Merge remote-tracking branch 'origin/create_logic'
Merge branch 'master' of https://github.com/cs2103aug2014-w11-4j/main