Merge commit '72a62aa69caf3cac4ed1aa92eab6f15e56126e7b' into Joel

Conflicts:
	JOYTZ/src/Controller.java
	JOYTZ/src/GUI.java
Merge branch 'Joel'

Conflicts:
	JOYTZ/src/Controller.java
	JOYTZ/src/GUI.java