total score is now displayed on the summary screen
Merge branch 'Ning'

Conflicts:
	Unity Project/Assets/Characters/GameObjects/Character4.prefab.meta
	Unity Project/Assets/Scenes/WordMaking.unity