game is now playable

YEAHAHHADHADHADH
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Assets/Resources/Scripts/GameManager.js