...
Merge branch 'master' of https://github.com/Stetter/Java_Project

Conflicts:
	MainGUI.java