Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/InformationGUI.class
	src/InformationGUI.java