Revert "Additional changes not committed with the prev set"

This reverts commit d704c8b0f4c0f9ebb2e5f08dc026cab2836b2610.
Weird Revert Commit

Please beware of this revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Controller.class
	bin/OPLogic.class
	bin/Task.class
	src/Controller.java
	src/OPLogic.java