Cleaned up commit

Changed the files so that it is no longer broken. Made changes to the
UI.
Merge remote-tracking branch 'origin/master'

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