Merge origin/master

Conflicts:
	src/simonsays/gui/SimonSaysGUI.java
Merge origin/master
Merge origin/master

Conflicts:
	src/simonsays/gui/SimonSaysGUI.java