Hand-in Version
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeamApp/src/GUI.java
	TeamApp/src/Main.java