changed tasklist
Revert "changed tasklist"

This reverts commit 2d2e4c012545fa353bbb2581a353d1c311b07583.
changed tasklist
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/ResultGenerator.java