Getting new changes
Merge origin/master

Conflicts:
	derby.log
	src/simonsays/gameModel/MakeSound.java
GUI Modifications: Change to Metal look and feel; colour alterations; Added highscore menu option (not functional)