Merge upstream/master

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

Polished Accomplish and Delete Icons