Updated to final version after Rumors
Merge branch 'master' of /home/kevin/SyncedPlay/SyncedPlay

Conflicts:
	Settings/cues.txt