added stuff
Merge branch 'Ning_fix_shuffle_button'

Conflicts:
	Unity Project/Assets/Scenes/ScoreScreen.unity
	Unity Project/Assets/Scenes/WordMaking.unity