Merge pull request #7 from Lesterrific17/master

Renamed Some Components
commit before pull
fix merge
Merge pull request #8 from Lesterrific17/master

Add new Window added Cancel Button
Merge upstream/master

Conflicts:
	src/ui/MainWindow.java