Added Currently Running Task
Merge upstream/master

Conflicts:
	src/ui/MainWindow.java
Merge pull request #7 from Lesterrific17/master

Renamed Some Components