Merge upstream/master

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

Add new Window added Cancel Button