error lines
Merge branch 'master' of https://github.com/cs2103aug2014-w09-2j/main

Conflicts:
	JOYTZ/src/Executor.java
solve some errors in the Executor due to the changes in Feedback and Task
Merge branch 'master' of https://github.com/cs2103aug2014-w09-2j/main

Conflicts:
	JOYTZ/src/Executor.java